diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-16 04:17:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-16 04:17:31 +0000 |
| commit | 6526999606d4b836712afa26ef67d1bea56481b2 (patch) | |
| tree | 7729bdb9b5cbb0ea57f7299e61d5d34766e45709 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8d354de5e4e8b7927e1d65cbaf5056f86445e66f (diff) | |
| parent | 6c5cc77193743a6cb66d2c384fe4cc78a1e0baa2 (diff) | |
Merge "Merge "[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da am: a4e00fbcd3 -s ours" into rvc-d1-dev-plus-aosp am: 51bfc92ee2 -s ours" into rvc-qpr-dev-plus-aosp am: 6c5cc77193 -s ours
am skip reason: Change-Id I4f827664c528bea30cc957a0a617dd37693f4460 with SHA-1 4d2791b1a6 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862409
Change-Id: Ibad172f0168ecd8ad0eba2d642efdedf57eef399
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions