summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorVictor Chang <vichang@google.com>2016-05-23 12:03:40 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-23 12:03:40 +0000
commit8dda22449b47ff3f9fa22c8ee790baaa502ef610 (patch)
treef18b4f23760535840cf3c0410eb17d186883dd01 /tools/aapt2/java/JavaClassGenerator.cpp
parentd306fda1c7513768bb80ffb234ee4d03a9fdcfc8 (diff)
parent1e93177121848f337c512b7ce0d06265abb02356 (diff)
Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev am: d86ac8116b
am: 1e93177121 * commit '1e93177121848f337c512b7ce0d06265abb02356': New api in LockSettingsService to get StrongAuth synchronously Change-Id: If568c19a9fb67eb847b776981a42049cececfe45
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions