diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-06-25 18:39:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-25 18:39:17 +0000 |
| commit | 965b3da8e5f7e1733e3892a45f71bdf8e778e66d (patch) | |
| tree | cd48f2bc0649abd37b362b68949df8f34234ccd7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d7e3eee906097830051db9f83949c1ebf33816d7 (diff) | |
| parent | cfa4e77f8317f2bc8c2ab5adea1b7a23f6737bcb (diff) | |
[automerger skipped] Merge changes from topic "NR_onDataConnectionStateChanged" am: 1ad68321d7 am: 2a4b3ede3e -s ours am: b771d2dcfe -s ours am: cfa4e77f83 -s ours
am skip reason: Change-Id I4678ace5b16ad06eacd8abf268960dd3bdb5a77f with SHA-1 4c73916641 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1347355
Change-Id: Ia651f0c655c3d1c16a62d3789f4518fa4ef75b34
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions