Edwin Kempin ef320f6168 Merge branch 'stable-2.14' into 'stable-2.15' ...

* stable-2.14:
  Add /plugins/cookbook-plugin/ to .gitignore
  AccountManager#lookup: Don't use account index to resolve external ID

Change-Id: I3a1733eb8924d3ab8084def78ff9154214f623da
Signed-off-by: Edwin Kempin <ekempin@google.com>

2017-11-06 17:05:49 +01:00

..

gerrit

Merge branch 'stable-2.14' into 'stable-2.15'

2017-11-06 17:05:49 +01:00