OSDN Git Service

Merge "Get account features before taking lock (cherry-pick from master)" into nyc...
authorTreeHugger Robot <treehugger-gerrit@google.com>
Wed, 4 Jan 2017 18:54:05 +0000 (18:54 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 4 Jan 2017 18:54:07 +0000 (18:54 +0000)

Trivial merge