| commit | defdc98152e65491ff66c926757965f9323b9579 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Mon Sep 21 08:27:05 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 21 08:27:05 2020 +0000 |
| tree | 69ff9e6fc93eff9dbd2bbc7708b2485f79e37232 | |
| parent | 952cf756f85c41ccbfe79386e1f315bd0bb7b5bb [diff] | |
| parent | 19984fcbf0e662e50fad375060288f9487fb8bee [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 725af62a59 am: 1138d178c4 -s ours am: 9dce16d237 -s ours am: 0b754492ac -s ours am: 19984fcbf0 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515 Change-Id: Iab55ccd9cf2cfd9fbd2e3859059b03df35ff52ef