| commit | e8dce8b00f6d0f9e8521c7d693c54c270003a2fc | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Tue Sep 08 14:25:32 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 08 14:25:32 2020 +0000 |
| tree | 6f8b206d60842804233f1dd6a45ea67e8c7e24e5 | |
| parent | 2c313a31d2602b90c302573bb160a8190f1567e0 [diff] | |
| parent | 774d41028ab434d75c7c3f515176dac942d7c581 [diff] |
[automerger skipped] Merge the framework-defaults into framework-minus-apex am: 3e20672380 am: f5b867d3f1 am: c3d5dd4170 am: 774d41028a -s ours am skip reason: Change-Id Ia06b50195dcf7de076664af4592616be5264ae21 with SHA-1 5954c6d593 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12534238 Change-Id: Ie3a5f60dcaeed2c35bfbbacbfaa843859a6cdfc8