commit | ae4ffab1ce546d38af55a74e9ef09128dfd9425a | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Dec 03 04:39:51 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 03 04:39:51 2020 +0000 |
tree | 33422f62e73bb915e2f1a282ef244329f052ec62 | |
parent | 649560985326d4c696e939cd11d9423c767df93d [diff] | |
parent | 17696d2ffc813801dc59bd9ec4eaa20689ea925b [diff] |
[automerger skipped] Merge "Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master am: 9e27e114af -s ours am: 17696d2ffc -s ours am skip reason: Change-Id I78222391b83a4add8e964340ec08bb8a1306e1c6 with SHA-1 07ec9b4dcb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13120883 Change-Id: Ib5972f772565b2bd10e6ccee5014719037898252