summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorBill Yi <byi@google.com>2016-07-01 05:19:01 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-01 05:19:01 +0000
commitb43e0c8b81e33f448bad7fe82fb20c2d03f4e5bb (patch)
tree718f9de5999d4d5756d3a5b698802fdd9b3909c8 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent7f553a4b268047a63df7e000e86ba3784dfd1e59 (diff)
parent5678f94efbaeb428b80b0ef01ef0ca074a47a6de (diff)
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: aac5c0e427 -s ours
am: 5678f94efb -s ours Change-Id: I14de2c2c83862efda9a087a11f663a7b443d0188
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions