| commit | e96992ff619602c38c0e3c2a1566c08372cd31ab | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Aug 06 13:25:46 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 06 13:25:46 2020 +0000 |
| tree | b36a7ff413b20ab28d38e33542872c01718fa439 | |
| parent | 4e51140b486be40bc38d77de5ca0c07fcd805989 [diff] | |
| parent | 8d592fae4e2bbd7e1eb940dbf8d37b91c54a6a2c [diff] |
Merge "resolve merge conflicts of c94e810cabc04da9e7327ef002a678486d8e1f6f to rvc-dev-plus-aosp" into rvc-dev-plus-aosp am: a3d8ee34a4 am: 8d592fae4e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12316526 Change-Id: I888d50a4c2974b39a1ce2cdfea61d190f767ba96