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>2020-06-15 16:12:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-15 16:12:20 +0000
commit233a75da08924ec3f9c2937ff5cb8a677c71fb39 (patch)
treebc7736469ef7446a82c4b8e617f497d719cebabb /tools/aapt2/java/JavaClassGenerator_test.cpp
parentd1e22f7310e3672b81bcfc2972fe074b918b6a23 (diff)
parent2f830909f86e025a6a419dcf5ee4feb7ea21ddaa (diff)
Merge "Merge "Fix occasional bad placement of Conversation header" into rvc-dev am: c744ad246e am: fa9391fead" into rvc-d1-dev-plus-aosp am: 6eb60e2945 am: 2f830909f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11797119 Change-Id: I577cd204559e654c027283a57e30758a3dbc7a0b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions