tree 57be4fd6590393f8c4d32668a0be7049ddd1dc73
parent 407c4343b2dde2a2f9ac918a5fd2232f621d8ac4
parent 83fec0069787263ce1ed2f3f75ccf2eadc67705e
author Phil Weaver <pweaver@google.com> 1463067787 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1463067788 +0000

Merge "Fix a race in settings update." into nyc-dev