| commit | 831a34a647dc35fe8002abdc146fdc8fdf3e55d9 | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Fri Oct 30 22:24:08 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 30 22:24:08 2020 +0000 |
| tree | 1208551150680930ffc9b88224ef6b76d785a112 | |
| parent | e79d7e5fc430cdfb00dd3473851c4d47b7b1998e [diff] | |
| parent | f297e4494a3a67bd41796f35cfbf5f89d57c4936 [diff] |
[automerger skipped] Merge "resolve merge conflicts of 887f4fbc740f2de31205d8e37e664b6813e9638f to rvc-qpr-dev-plus-aosp" into rvc-qpr-dev-plus-aosp am: f297e4494a -s ours am skip reason: Change-Id I843efb4880b6caaf3872e9b0918fd710fb93d979 with SHA-1 6cbaff2471 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12955699 Change-Id: I26b3acb49b3b07bd67cc921c811ddeea8964caaa