summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorPaul Jensen <pauljensen@google.com>2014-12-17 18:50:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-17 18:50:30 +0000
commitb9d5551be23a9f0129b64fd9c73ba2bf1dcc852b (patch)
tree776dbc0dca9320247cbe25c30ccf21d384637e59 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent55950d5c762b5cc242c7d070f9b0e36279a055dc (diff)
parentc266f62fd9f241b0d122bae7ad016ecd58ab40da (diff)
am c266f62f: am eece3339: Merge "Show broken lock image when SSL errors are encountered in CaptivePortalLogin." into lmp-mr1-dev automerge: ee8feae
* commit 'c266f62fd9f241b0d122bae7ad016ecd58ab40da': Show broken lock image when SSL errors are encountered in CaptivePortalLogin.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions