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

am: 2258e5fdb9

Change-Id: Ieb15cc47f1db3ff805a91615d64bbe2c23d914ea
This commit is contained in:
Makoto Onuki
2017-01-04 19:00:06 +00:00
committed by android-build-merger

Diff Content Not Available