summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorBrad Ebinger <breadley@google.com>2018-06-08 12:45:30 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-06-08 12:45:30 -0700
commit741d43b7bb9e92390f80dd328ec18eaaf56ff237 (patch)
treecfe2ce3bfb74ebb824190dabb95e1d851647d325 /tools/aapt2/java/JavaClassGenerator.cpp
parentefa137b7004cdf93eb05b604673a528550045b79 (diff)
parent1ff8f364d4af93a354b3b618e05cb849f388a10a (diff)
[automerger skipped] Merge "Adds a private field to parceled data." am: 7db23752ab
am: 1ff8f364d4 -s ours Change-Id: Ia4112ec02579389e4fa02fabe7de493ee087124b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions