summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorWei Liu <luciferleo@google.com>2016-02-04 18:05:34 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-02-04 18:05:34 +0000
commit4577aac5510db6c3255a5e09a573c52bbfa8b609 (patch)
tree379c03b344a42c81b7292f29bfbc8b774748a83d /tools/aapt2/java/JavaClassGenerator.cpp
parenta3144a52c63a8f69f0f79fe05070fd181bc70b1d (diff)
parentfbd88d132e3d75c9f1af607fc1ba00a6596d7406 (diff)
Merge "DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT." into cw-e-dev
am: fbd88d132e -s ours * commit 'fbd88d132e3d75c9f1af607fc1ba00a6596d7406': DO NOT MERGE ANYWHERE Start the FingnerprintService only if it has FEATURE_FINGERPRINT.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions