summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-06-06 10:44:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-06 10:44:21 +0000
commitaeb86ec3bf8c39a29efe8a846472846cbec16103 (patch)
tree1df991cb98391efcba93326fa00ed7a487dbeadb /tools/aapt2/java/JavaClassGenerator_test.cpp
parent01dbfb8b2e36ffe7b047395f5a66f8196a6fc0d3 (diff)
parent51261c6451646067e1fde28e2e62efb65c399b5f (diff)
Merge "Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev am: 265f4113ee am: d2cf835880" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions