diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-16 03:42:22 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-16 03:42:22 +0000 |
commit | 67a900550097cc02d0da3a220ac414fb91a99ff7 (patch) | |
tree | 42e6cea2cd8335426b50add9125e3f65d906b600 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 70fa6f16e814267070893652ae34baedaf893616 (diff) | |
parent | 2b89a1680d5f5bafc6e4f2cf64a2167c4cfe2d1e (diff) |
[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da -s ours am: 2b89a1680d -s ours
am skip reason: Change-Id I4f827664c528bea30cc957a0a617dd37693f4460 with SHA-1 2153861f8e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862409
Change-Id: Iad71a237e3bac6340747e86a77c5569fea0bfb42
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions