diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-06-25 18:14:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-25 18:14:30 +0000 |
| commit | b771d2dcfe6e1ea22654bb13316f3df3dc2ceae4 (patch) | |
| tree | 35932f33548d930cac3a85f0c78ec4780ba8a525 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | bccdd55cb0b4403e3afcd0b2385ad6066fc67fdd (diff) | |
| parent | 2a4b3ede3e6eae588160e64b19f6fea926801b16 (diff) | |
[automerger skipped] Merge changes from topic "NR_onDataConnectionStateChanged" am: 1ad68321d7 am: 2a4b3ede3e -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: I4f834ce1bbbeba75eeb7c7b55a03bc848f6ce4e8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions