diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-24 20:41:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-24 20:41:01 +0000 |
| commit | 1b326539bc3b087aaca0a3904725e8b06457bc6c (patch) | |
| tree | 33b8f90fb59eb8097dc53f9ea643949914203ed2 /tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp | |
| parent | 46292517f23679da5e34567c7e13443a0455421d (diff) | |
| parent | d6037a66b06a93b25ede1fd9bbe212b9ec400823 (diff) | |
[automerger skipped] Merge "Cancel pending timeouts when media data is removed" into rvc-qpr-dev am: 7040e32b1a am: d6037a66b0 -s ours
am skip reason: Change-Id I2925814132c712b2482681f699f647bf5707e664 with SHA-1 f5e463fa86 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12684219
Change-Id: I78ef401ba1f2dbcc5cec129b24ef853ca9b171a0
Diffstat (limited to 'tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp')
0 files changed, 0 insertions, 0 deletions