diff options
| author | Ningyuan Wang <nywang@google.com> | 2017-08-03 00:02:52 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-03 00:02:52 +0000 |
| commit | f76fb72c7ac8e3762ebde8402e994612988cebb2 (patch) | |
| tree | 17619fb78270fa9d51d6f3f3886e7b840341fa7a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c7915ce7a57b7a0498367552fa3b1b27d8fbfe5c (diff) | |
| parent | b1e8d9786743535e95e5dc957c1ea48f0429491d (diff) | |
Merge "Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev am: 54e6518fc8" into oc-mr1-dev
am: b1e8d97867
Change-Id: Ifd8b2fcb43d8cc59fda3a59ef358442d7dd80b3c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions