summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorPaul Jensen <pauljensen@google.com>2015-09-23 19:51:53 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-23 19:51:53 +0000
commit42324851f16868c8744c5e20347b70b5712473f2 (patch)
treec18bdd8357f34650e7a42565929be44d3263cecc /tools/aapt2/java/JavaClassGenerator_test.cpp
parent89b9f9f5072df4a0eaca3686a643999061e185d0 (diff)
parentf86347f54d0da443172713db0f6fc145ca5b19ff (diff)
am f86347f5: am 88674941: 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 'f86347f54d0da443172713db0f6fc145ca5b19ff': Fix NOT_RESTRICTED network capability and enforce it.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions