tree 41e12f0dd942570b277d5d78ab6416a75ec3f94b
parent 52f61a23994c4c660df9a16d524677300a9e3799
parent e8977e9c10e99bdb6564a766395fc66bd972df58
author Amith Yamasani <yamasani@google.com> 1500615947 +0000
committer android-build-merger <android-build-merger@google.com> 1500615947 +0000

Merge "Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am: 6b4f0bb6fe" into oc-mr1-dev am: 5f927337c0" into oc-mr1-dev-plus-aosp
am: e8977e9c10

Change-Id: I0e17332b7fa2476044b20b3854e3b6c8e95159d9