tree 2d8721f991808d1f2bfdce2c086140a849457b23
parent 46564cbac6385d8fe7db04b9abc1a05afab36c85
parent 8de4d5eccacfb220442226b886a4b649a9f1063d
author Guang Zhu <guangzhu@google.com> 1462865229 +0000
committer android-build-merger <android-build-merger@google.com> 1462865229 +0000

Merge "Revert "Persist settings on a dedicated background thread"" into nyc-dev am: 875e99443f
am: 8de4d5ecca

* commit '8de4d5eccacfb220442226b886a4b649a9f1063d':

Change-Id: I44456241f432bfd334f5cab2a6cc2273ee3429f6