OSDN Git Service

Merge "Fix a race in settings update." into nyc-dev
authorPhil Weaver <pweaver@google.com>
Thu, 12 May 2016 15:43:07 +0000 (15:43 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 12 May 2016 15:43:08 +0000 (15:43 +0000)

Trivial merge