| commit | fe417aaa65c51a0f7988ef0f9e10b35412bb01c9 | [log] [tgz] |
|---|---|---|
| author | Chavi Weingarten <chaviw@google.com> | Wed Dec 09 20:40:05 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 09 20:40:05 2020 +0000 |
| tree | d7937e3101fac1dd04ece331a05c029009db9935 | |
| parent | 7416488284646457f48010af59356a9822407d78 [diff] | |
| parent | 3ee6879e91eb132e0b24e2adefd4d8eae2491a62 [diff] |
[automerger skipped] resolve merge conflicts of cae2ee036040fc0dce9fc82af9bf8d85240d566b to rvc-dev am: 60f3ab275e am: 3ee6879e91 -s ours am skip reason: Change-Id I4d87e90793a88a646aaa1ae5806f118f1ae51e30 with SHA-1 e70cc6c648 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/13186612 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie0377224b3db4808c19d1225886e5a2e25e48bb4