| commit | 8a72818f653a08e6859119c604d48884b5060ec5 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Aug 20 04:43:44 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 20 04:43:44 2020 +0000 |
| tree | fa04bba242b4152734837a3654b9f6d4ea3644b3 | |
| parent | d2eebb8ef218ff496ab2ef11e0053148ba7f4c27 [diff] | |
| parent | e30e470fab0b09107baa9fd8ac0676098788e5c4 [diff] |
[automerger skipped] Merge changes I0faeda20,I726e74f5 am: 4cea2d3830 am: 363fe9d0b5 am: e30e470fab -s ours am skip reason: Change-Id I0faeda20f0506a48ac1131b234c5fc40d95dfbe0 with SHA-1 d75a22bc20 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397954 Change-Id: I626a13a0b12b1386b001de9d3e0bc978c0e48c6a