summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-13 19:49:19 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-13 19:49:19 +0000
commitcb43a6d31ee6a848c1fbd52873fd834330b3acd0 (patch)
tree098daaec65855cde9efd526e4e9929935c4cd42a /tools/aapt2/java/JavaClassGenerator_test.cpp
parent7d724cfb01b850fc1623bb9a348eb91d96be3063 (diff)
parentdbdf483f31569f8fb2f8cb770235d82ec30f8b77 (diff)
[automerger skipped] Merge "Put userId at the end of parcel" into qt-dev am: 899f8301e0 am: 056b56c6b7 am: aea739b3f4 am: dbdf483f31 -s ours
am skip reason: Change-Id I98137a095cddf0fb4c600e1e09eef507bb750528 with SHA-1 709c0a1cc8 is in history Change-Id: I638d603fa2c83058af3a393f3e88005c560fdc07
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions