| commit | f9f95947fb2c996559dfa4b176d6a6b9892705f3 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Aug 20 05:00:44 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 20 05:00:44 2020 +0000 |
| tree | 81d53185d5b5538f0969ff4c20e97d1261a8a745 | |
| parent | 82b1eb23c2b2caa7c80001ed84291da12b14c19b [diff] | |
| parent | 5312ef34e03723042f0886aabe93f4816ce7c2ef [diff] |
[automerger skipped] Merge changes I0faeda20,I726e74f5 am: c6a61f9eee am: 2c3d87e23c am: ca4235f9a6 -s ours am: 5312ef34e0 -s ours am skip reason: Change-Id I0faeda20f0506a48ac1131b234c5fc40d95dfbe0 with SHA-1 923ab36b89 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397954 Change-Id: Ibb6e437300cba97e85a4d4f6f4574c1018d8c4f8