| commit | 5a72f60cd99a197c64a225831445987fbe437b7e | [log] [tgz] |
|---|---|---|
| author | Philip P. Moltmann <moltmann@google.com> | Mon Nov 09 19:37:20 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 09 19:37:20 2020 +0000 |
| tree | 07513cc1941805b8927620e346072963a040a10c | |
| parent | 27221c0b52505058554b2b1a9f5084097210bed0 [diff] | |
| parent | f2bc09c705921e38d473fc02c6d961515b6f8af3 [diff] |
[automerger skipped] Merge changes from topic "12940341" into oc-dev am: a9a03ae669 am: b172aaf747 am: 37beb3172b -s ours am: 5ea00f8c6c -s ours am: b77727b905 -s ours am: f2bc09c705 -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: Ida5c9e42bb0d68121bc46cd35f9b707f8cc567e1