| commit | 5312ef34e03723042f0886aabe93f4816ce7c2ef | [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 | 81d53185d5b5538f0969ff4c20e97d1261a8a745 | |
| parent | ec46592a67a8a30a54000ae4413ecd72653cfcdf [diff] | |
| parent | ca4235f9a68d462c3e82b65d6d01f7e68f414668 [diff] |
[automerger skipped] Merge changes I0faeda20,I726e74f5 am: c6a61f9eee am: 2c3d87e23c am: ca4235f9a6 -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: I626a13a0b12b1386b001de9d3e0bc978c0e48c6a