| commit | 7de107c919f5958c0d27db684106fc9b64f93441 | [log] [tgz] |
|---|---|---|
| author | Wonsik Kim <wonsik@google.com> | Fri Apr 09 05:59:24 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 09 05:59:24 2021 +0000 |
| tree | c83434040ac4dad3fd668c69210d6f132b7e5f5e | |
| parent | fdafa0ce976b40aa93bb3ae73f3c32737b446409 [diff] | |
| parent | 283433490699f2160e733b7e467289f16b14a175 [diff] |
resolve merge conflicts of 3d7f7608701355ddcbf98eb2b62639e0613ff3ad to rvc-qpr-dev-plus-aosp am: 2834334906 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/14129079 Change-Id: I5a325b3ace463f1c0afc565f92a090424a6be9e4