diff options
| author | Paul Jensen <pauljensen@google.com> | 2015-09-23 17:42:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-23 17:42:46 +0000 |
| commit | 88674941e1cb506554e23d7f44170c5829094615 (patch) | |
| tree | 938a6dd806ac939bd509c3bc130a58b1b0a4b196 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1584eefebd2de1bcce0e589ee6414df4bade07b9 (diff) | |
| parent | 6a728e1744749a6b27e22d696b5327909e57d126 (diff) | |
am 6a728e17: am 83ce299c: am 62bb1897: am 554cecea: (-s ours) am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
* commit '6a728e1744749a6b27e22d696b5327909e57d126':
Fix NOT_RESTRICTED network capability and enforce it.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions