| commit | 3b57e377f533bc9349622af9dc68c2d391c7fcae | [log] [tgz] |
|---|---|---|
| author | Jordan Liu <jminjie@google.com> | Tue Jan 16 22:51:34 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jan 16 22:51:34 2018 +0000 |
| tree | d16dea086e9b79b1a78762b07695990b96c2c962 | |
| parent | edc27c8605a2fac8b12836e77e97c9199596b002 [diff] | |
| parent | 5cab952a96fbf6b303945a0588a0f0f904cd6d27 [diff] |
Do not overwrite carrier/user edits with UNEDITED am: 58cbcd9400 -s ours am: 5cab952a96 -s ours Change-Id: Ief7911d10f702734b39b8b8f508a2fcf85ddc170