commit | 6f6c141547c15d8c070af22134f706b80f35f240 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Sep 02 23:44:58 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 02 23:44:58 2020 +0000 |
tree | f314a575bd9e3adbc24c136ca817020299d2020c | |
parent | b0f6fa2f357baeb3a75a4b4bdbf9aa0477489201 [diff] | |
parent | 455e36efe2fce8969c76d68c37445ff3ac7baa84 [diff] |
[automerger skipped] Merge RP1A.200720.011 am: c8c8e8e8be -s ours am: ed22f48840 -s ours am: 455e36efe2 -s ours am skip reason: Change-Id Iec7a26ecd68aca9c7a38cc8f441197a8237b0c8c with SHA-1 b89c6d94c5 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12514348 Change-Id: I69458ecf599da92d513da87251868a04ff24f3f9