commit | 49b490ffc23a1b236c720520d2aabdf781fbf7a6 | [log] [tgz] |
---|---|---|
author | Kris Alder <kalder@google.com> | Thu Oct 15 23:31:20 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 15 23:31:20 2020 +0000 |
tree | 10518473c81a4c44859aa037e14277d70faeb37b | |
parent | eb4b3bbe2926c9b51301568f6f0720383f82e22e [diff] | |
parent | 996c214bbcdc6742a86b6102088a774d2567d5ab [diff] |
Merge changes I3929bfb6,I4ad6fa07 am: 632056e550 am: bf13fc87b0 am: 996c214bbc Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1458126 Change-Id: Ib1ce48b48cebf085aa5bf847d26d21be38b28cc7