OSDN Git Service

Merge "Fix a race in settings update." into nyc-dev
authorPhil Weaver <pweaver@google.com>
Thu, 12 May 2016 16:53:49 +0000 (16:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 May 2016 16:53:49 +0000 (16:53 +0000)
am: df15e03ed0

* commit 'df15e03ed062493b506f7599ff1e6aff26828485':
  Fix a race in settings update.

Change-Id: I970606b21b1a5cd2d19e0f21077636e68f107c6b


Trivial merge