| commit | 6b2fb28f4e36904455817560af49ddfdcfc62138 | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Fri Jul 21 05:21:20 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 21 05:21:20 2017 +0000 |
| tree | b798ca4be1a5e79ec54d7647afa7f4f8fc3d3666 | |
| parent | 04f7602c32890febf35b61629ef13ebdf020127a [diff] | |
| parent | 30f2df2f34616728fa4619bf15fc6a4599fa725a [diff] |
Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am: 6b4f0bb6fe am: 30f2df2f34 Change-Id: Iff9161c952f9327dbe8da34d22c0dc36d6e3d831