commit | 52f61a23994c4c660df9a16d524677300a9e3799 | [log] [tgz] |
---|---|---|
author | Amith Yamasani <yamasani@google.com> | Fri Jul 21 05:40:16 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jul 21 05:40:16 2017 +0000 |
tree | 41e12f0dd942570b277d5d78ab6416a75ec3f94b | |
parent | 6a6093060f3c5e387b852eaee4b2c694202895ad [diff] | |
parent | d1496ec2c042586bfddaea0f6b98958d4991aed7 [diff] |
Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am: 6b4f0bb6fe am: 30f2df2f34" into oc-mr1-dev-plus-aosp am: d1496ec2c0 Change-Id: Ib0fb011ab8723c9da3869987b354515e59b88d65