| commit | 92b2058dd61c0b9e804a43ef301eb259e3ba9fc5 | [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 | 2a40ff896cee88ea6b7b97de08e12e2fd17abc73 | |
| parent | 155ef63dbba7689003c8d889b0dd189b22a0d01d [diff] | |
| parent | d4d168512085d10dd6b1ba50f69be3ef6f1be248 [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: b363d45769 am: 2e8a4f4fc2 -s ours am: 6f6158c057 -s ours am: f682d85982 -s ours am: d4d1685120 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515 Change-Id: Iab55ccd9cf2cfd9fbd2e3859059b03df35ff52ef