| commit | e88bfc12fa63b5f083d87faa5f40751b3bbfc1c9 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:33:20 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:33:20 2020 +0000 |
| tree | 27a7cd1cc44669e7deee1b9be06ff201c80492ba | |
| parent | 3f185ad132f4dd2c4e31a06b69aec83aa44fcd39 [diff] | |
| parent | 9e985564491244bb08054f45a2392fc6826be6b2 [diff] |
[automerger skipped] Merge "Merge Android R" am: 0bbd9a10e5 -s ours am: fcc43c2c03 -s ours am: 9e98556449 -s ours am skip reason: Change-Id Ic54c8dcf210e9b375e7fdce6444c7d882a1784d6 with SHA-1 451a36a9a6 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1422365 Change-Id: Ia68df4d8a961cb01c27f390b516c5da2b136db7e