| commit | 92c963901ce8d933e15ba13bd9d5c3bd1cf0ceab | [log] [tgz] |
|---|---|---|
| author | Kris Alder <kalder@google.com> | Wed Jun 24 17:55:16 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 24 17:55:16 2020 +0000 |
| tree | 99a7f8c7ffb70c0fc87a258586879501e0112b26 | |
| parent | 5f1f6e0b69eb57227483cddab92570069b768fef [diff] | |
| parent | f3a871808291b9590513f158c4613fde27b1e36b [diff] |
Merge changes I6991827a,I85299a83 am: e87ca15798 am: 6406b93840 am: cac3ba5c6e am: f3a8718082 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1340016 Change-Id: Ia417f54b73a2d4bd2adf09b8e5cf1ab32e9e9a8a