summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorJakub Pawlowski <jpawlowski@google.com>2017-11-09 22:30:31 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-11-09 22:30:31 +0000
commit64a1fbb8cf617978be0dc8bd9b4ce36dcb698e5e (patch)
tree2c1b72c9a39157b4144ab4b424dc8b615a842966 /tools/aapt2/java/JavaClassGenerator.cpp
parent6e78c792b1570af9e18251c8ce18081ad0ea35f0 (diff)
parentb2bde067c2b0ec1f896af26ebcb97fdafa31fca3 (diff)
Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_native"
am: b2bde067c2 Change-Id: I3c067c01d6fba25022e80950eb77c3d98405b481
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions