| commit | f8a142cb58e38752d5c2c42435c6c5ed7d7edbe5 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Aug 20 05:10:53 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 20 05:10:53 2020 +0000 |
| tree | 3be7892c463ac2856f1124c56f4c61e605f3d42f | |
| parent | 98dd77ef5471aa6290e832ebaa4615c09657947a [diff] | |
| parent | 1950d8311eeee5e9ac5a524bb7ab5a59e46b104b [diff] |
[automerger skipped] Merge changes I0faeda20,I726e74f5 am: 4cea2d3830 am: 363fe9d0b5 am: e30e470fab -s ours am: 8a72818f65 -s ours am: 1950d8311e -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: I9632d9e663df445d337dbb55956edea8f95b9a30