diff options
| author | Chris Elliott <chriselliott@google.com> | 2016-11-10 19:03:16 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-10 19:03:16 +0000 |
| commit | 34e1c6a05345d0f3c1f6ad7515075c2a32d2a7bf (patch) | |
| tree | be93e4969e34bdd9d30c8673028ce738210444f0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 262d5e56b50bf916cefe91d8177ea1191b860d5d (diff) | |
| parent | d3dd8e99fa61b1b659c59639327dd58b5142e7fc (diff) | |
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am: 06a55fb553 -s ours am: 0e11e0d961 -s ours am: 69246f0565 -s ours am: a8a116b001 -s ours am: 8409d50122 -s ours am: c07d8aa52d -s ours am: e2dd105af2 -s ours
am: d3dd8e99fa -s ours
Change-Id: I391dabf19257106be0464ad2fbae86ae464da7e0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions