| commit | 3b8115928b9840a4e3892b1ece62f3c4e11d1eee | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed Apr 14 06:31:20 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 14 06:31:20 2021 +0000 |
| tree | 71a0f98ec556de0d0dceacda443227193f8fee9a | |
| parent | d76eb01fbeecbe2367014cfdf1d0365295bf89d0 [diff] | |
| parent | 7771a62ab11a37e7418a707a984f9d3a8f1b30e1 [diff] |
[automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 24c6eaea15 -s ours am: 7771a62ab1 -s ours am skip reason: skip tag Change-Id I735b41ed53ce7d374b5d36c4aee79f73d0334234 with SHA-1 bf7c109ed6 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674888 Change-Id: Ie4dfff3cfbe5df4b60353217e8f99611438fd2be