| commit | 1f123726d9862d7e97728fcef3ff6fd87196b4ef | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Tue Sep 15 20:32:15 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 15 20:32:15 2020 +0000 |
| tree | 0ab5bd30b4d1c0ac02cf2e824c3424c6518d988b | |
| parent | a2237296823202bec01a6ca552e5e8b8b2df224f [diff] | |
| parent | bbf704318953b096bb12ae6022ac23fbe4727ee5 [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -s ours am: 38f130d49c -s ours am: f9aa95f580 -s ours am: bbf7043189 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12577741 Change-Id: I1713ac8976730a0e6a414cf0e761f7f0267cf51e