| commit | b41c594c5a212b0381bdac74189bab4b115c1883 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Wed Feb 17 23:39:25 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 17 23:39:25 2021 +0000 |
| tree | 66cd61dd77f13969e85936eae04117dcb2d03388 | |
| parent | 5202aadc475eaad896e09315153df19f922b3040 [diff] | |
| parent | 0ba121e84c261c03b13ef5d7e5271d5050ccd2d3 [diff] |
[automerger skipped] Merge changes I49ab063d,I6d2d5013,I203ff502,I7c6f244c,I11248ead, ... am: 5f4b6b4c62 am: a3b1e73465 am: 0ba121e84c -s ours am skip reason: Change-Id I49ab063d549b033aef06eadf39fd189384a5f724 with SHA-1 11340c4000 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/952494 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifc207b76d8148b0d319d3d37c3e9340da0af5cb1