diff options
author | Lorenzo Colitti <lorenzo@google.com> | 2015-10-22 06:28:24 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-10-22 06:28:24 +0000 |
commit | 8ecad265b6db57f78dd142e974057c91f69489ed (patch) | |
tree | 61510bc96613aa4110205f6ecf1a90e54e5fa398 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 6f39642389d2702125898c401ca9e8881a322fe0 (diff) | |
parent | bb8f652372f261edd2083103d4300a9173993706 (diff) |
Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev am: 809dcade99 am: bdc458048a
am: bb8f652372
* commit 'bb8f652372f261edd2083103d4300a9173993706':
Reinstate CHANGE_NETWORK_STATE as a normal permission.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions