| commit | acfeda847d55a1ba26648a1911120ab5efeb1002 | [log] [tgz] |
|---|---|---|
| author | Jakub Pawlowski <jpawlowski@google.com> | Mon Feb 01 09:18:21 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 01 09:18:21 2021 +0000 |
| tree | f79bd8a45e2dd58650b32746476ac960b19819c6 | |
| parent | 1a425310577356baa948767cf4a1dd130f5ddad5 [diff] | |
| parent | 32aea70bf4b699a09dc4941c9ae79f2dbdbb76ea [diff] |
Merge "resolve merge conflicts of 7d94276c261eda39a0baa2303c7d35d53c1af910 to rvc-qpr-dev-plus-aosp" into rvc-qpr-dev-plus-aosp am: 9dd3a7b6a0 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13431733 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ieaacca13ba75a2507c7f02ef4e988cd33703c1e1