diff options
author | Bill Yi <byi@google.com> | 2017-05-18 20:26:57 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-18 20:26:57 +0000 |
commit | 87b99e0e983666a341f2c0b910f0bc28ada67584 (patch) | |
tree | bba241fdcd9299d255a570eb377ef103ace6ea3e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | b7a8702e91361a5e1ad55119c1dd29d30186fb92 (diff) | |
parent | cfb3693fd80847936e7e00dad90e1c2b0f01e415 (diff) |
Merge "Import translations. DO NOT MERGE" into oc-dev am: a239ed1c79 -s ours
am: cfb3693fd8 -s ours
Change-Id: I6442efdc972861973d0330774b2f04503dc1c2e6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions