tree bde5de2b7df4dd266f58885f3f6b47884277ada3
parent 2ee80e169496896883ecc671f34ebc55364bd594
parent 8538b6695337235ce206c0c707da389f80337100
author Edwin Kempin <ekempin@google.com> 1509983824 +0100
committer Edwin Kempin <ekempin@google.com> 1509983824 +0100

Merge branch 'stable-2.13' into 'stable-2.14'

* stable-2.13:
  Add /.bazel_path to .gitignore
  AccountManager: Don't try to lookup external IDs from account index

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