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