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