summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-05-23 12:04:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-05-23 12:04:53 +0000
commit38f8eb343f1055f552d437560353aa3701bea764 (patch)
treef18b4f23760535840cf3c0410eb17d186883dd01 /tools/aapt2/java/JavaClassGenerator.cpp
parent8dda22449b47ff3f9fa22c8ee790baaa502ef610 (diff)
parent76ed5ce26ca34ac0adbff7a5e366ad0958d3a4c6 (diff)
Merge "Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev am: d86ac8116b am: 8806a4bdc8" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions