| commit | aa93711b05cb4e4f678cacee3b0a9b39c2181042 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Mon Sep 21 08:28:07 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 21 08:28:07 2020 +0000 |
| tree | 69ff9e6fc93eff9dbd2bbc7708b2485f79e37232 | |
| parent | defdc98152e65491ff66c926757965f9323b9579 [diff] | |
| parent | 9728001ba3ba314212e78faed647f9e84f4327e9 [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 8c7f330e7a am: 6dbeee66e9 -s ours am: e1d6cd570c -s ours am: 90ba8b743e -s ours am: 9728001ba3 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515 Change-Id: I98c9f5c3eb4bcf04506448220778841be7e4a48d