summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorVictor Chang <vichang@google.com>2016-06-06 10:33:00 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-06 10:33:00 +0000
commit6cbf4e51199e12d1d935415f6fa38031cb53ac4d (patch)
tree4845f0535c11efacf6ec1ee7cbfc01c137e8b373 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentced0e2960d1608df92d7de28fffc6c51001843d2 (diff)
parent265f4113ee42e89f324b087a81044a9f1dab457e (diff)
Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev
am: 265f4113ee * commit '265f4113ee42e89f324b087a81044a9f1dab457e': Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on Change-Id: Iba3df72496f067c5e0291449be3bfbd9ce2031ff
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions