summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorBookatz <bookatz@google.com>2017-10-17 19:58:08 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-17 19:58:08 +0000
commit72a538960dd134e5c6d555302a11464460e11ce8 (patch)
treed24738454c0b795bc174953aaf9eefaa65ce7542 /tools/aapt2/java/JavaClassGenerator.cpp
parent8721e4f7ee8cb708e50d080368697d4b7e4217c9 (diff)
parent9fccdd14e5cdbe5d6e7b1361d75480bda072fba4 (diff)
Merge "Batterystats handles nested unoptimized ble scans" am: 4627c01ee4 -s ours am: 2fd6b1d7cd -s ours
am: 9fccdd14e5 -s ours Change-Id: I593da51c7664d76c1ad64859823d434f4ce414fa
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions