summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorIan Pedowitz <ijpedowitz@google.com>2015-10-22 22:53:24 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-22 22:53:24 +0000
commitab49c51342effda610a6c5b151fd7705bf67e136 (patch)
tree172421b9ea61d22c421a20db51231401f3fe42bf /tools/aapt2/java/JavaClassGenerator.cpp
parent0aea646d890cd7510b78294b2338bfe275ac1f81 (diff)
parentd3511518f927eead41fb33c56803104672dcffc2 (diff)
Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev am: 09fd4ecf90 am: b402735fc0 am: 07129d53b5
am: d3511518f9 * commit 'd3511518f927eead41fb33c56803104672dcffc2': Revert "Track ashmem memory usage in Parcel"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions