| commit | e8977e9c10e99bdb6564a766395fc66bd972df58 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Fri Jul 21 05:23:42 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jul 21 05:23:42 2017 +0000 |
| tree | 84b583874393d5c03ff232eabfbd1e09201182c0 | |
| parent | d1496ec2c042586bfddaea0f6b98958d4991aed7 [diff] | |
| parent | 952d17371a3c5d4fe2ce089d531b32679170a629 [diff] |
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