| commit | 2ccaa8e07322a70cba08225e44291a52cd2a48ca | [log] [tgz] |
|---|---|---|
| author | Orion Hodson <oth@google.com> | Mon Aug 24 12:36:23 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 24 12:36:23 2020 +0000 |
| tree | 10c4a4c444a421ed43197776c3c1527bc78bc0f3 | |
| parent | 5188d09ab3e7126b75f4df3a716ac69d8d138d92 [diff] | |
| parent | 374718a2a8c35c2f2384eeea0fb2f07a1ee4c50b [diff] |
resolve merge conflicts of 525ed1c275ce445093448566eb72a55a1bdf939c to rvc-dev-plus-aosp am: be053b7e19 am: 08e54a12ec am: 374718a2a8 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12432135 Change-Id: I7c53db5f3c12e04df762e89b497bb2b45111876e