tree 87580a7306d6e48b4f86a3036a38f9eea23163ee
parent 86d1eb9b4b246ef9775b16c1c538ba5f6becba5b
parent 2258e5fdb98d9625db43441bb15c92b858594e0a
author Makoto Onuki <omakoto@google.com> 1483556406 +0000
committer android-build-merger <android-build-merger@google.com> 1483556406 +0000

Merge "Get account features before taking lock (cherry-pick from master)" into nyc-mr2-dev
am: 2258e5fdb9

Change-Id: Ieb15cc47f1db3ff805a91615d64bbe2c23d914ea