| commit | 40e3a7a239895c1407eb420f19e85d091d2d785b | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jan 27 10:25:50 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 27 10:25:50 2021 +0000 |
| tree | dba6889f7770a4c7c0e4d52ee5dafc13773e3ced | |
| parent | cd2437d61dd55ffaa57f6007f899efccafd8264c [diff] | |
| parent | 4d36c61c005bc0f7fb6400dbc7f8bb31742ddf5b [diff] |
[automerger skipped] Merge changes I2bb2cb29,Ie52ebe19 am: 991cfb0805 am: cf91618eec am: 4d36c61c00 -s ours am skip reason: Change-Id I2bb2cb29e872115d6448dfbeb7d957c52f56289a with SHA-1 ef03eef383 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1561121 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I65dc0242f4b8d2a8ddbf4a1f9caef1fb14dbce08