diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-08-27 20:08:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 20:08:45 +0000 |
| commit | 6dc8b65bb60e1e0d4e9cbb6d771869b82ab76757 (patch) | |
| tree | acd3e38539512eb037d74a6af7719b655d80b613 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ee2007289f2bc5a9f4809f5a27aab89d344db4ab (diff) | |
| parent | 72ef82c41414882029ddacef749b7f26bcad46db (diff) | |
am 72ef82c4: am c4b6cee6: (-s ours) am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev
* commit '72ef82c41414882029ddacef749b7f26bcad46db':
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions