diff options
author | Paul Jensen <pauljensen@google.com> | 2015-08-05 11:38:26 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-05 11:38:26 +0000 |
commit | abd27102f4e232be448bc6012e0bd833637ab3fa (patch) | |
tree | ccfc2c4b2c0340bf7ed7854e4b5b8ff07fb891da /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 9d1d5b7ac6ec9175dc4daea1b7ea128a26c4d3d8 (diff) | |
parent | 41779e467a478e11de2df10ad97542e6f2d57ca7 (diff) |
am 41779e46: am 95297732: am 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-dev
* commit '41779e467a478e11de2df10ad97542e6f2d57ca7':
Fix NOT_RESTRICTED network capability and enforce it.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions