commit | 30f2df2f34616728fa4619bf15fc6a4599fa725a | [log] [tgz] |
---|---|---|
author | Amith Yamasani <yamasani@google.com> | Fri Jul 21 05:14:51 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jul 21 05:14:51 2017 +0000 |
tree | 120cd292e78ef7bf858283f9a6b65a0f5d6ad958 | |
parent | 1d3929d46a9479300080ca9371a227babe60a684 [diff] | |
parent | 6b4f0bb6fee89b7df85759389583eeabe6f645c5 [diff] |
Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am: 6b4f0bb6fe Change-Id: Id069c0fd99a3a1b9ebd429c7f44542a2ae068926