| commit | b77727b9059067d12b8931e1b29126e89ac98a78 | [log] [tgz] |
|---|---|---|
| author | Philip P. Moltmann <moltmann@google.com> | Mon Nov 09 18:52:54 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 09 18:52:54 2020 +0000 |
| tree | 514114f86480a82bc7b709261fe8815081991fa9 | |
| parent | fb70a5eaa7196254d7172fa631cff01e8df9299f [diff] | |
| parent | 5ea00f8c6c30cf12c1671f79f511c988f46377a9 [diff] |
[automerger skipped] Merge changes from topic "12940341" into oc-dev am: a9a03ae669 am: b172aaf747 am: 37beb3172b -s ours am: 5ea00f8c6c -s ours am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 60c41ae4a6 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12987876 Change-Id: Ibc6b49c15249234ea4699defa0cd8bdce76f0400