diff options
| author | Bill Yi <byi@google.com> | 2016-06-07 02:41:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-07 02:41:23 +0000 |
| commit | 360724ecdaaf6c703c3b2d53eecc31492a08ce8a (patch) | |
| tree | a5e97e424dc94caf056887c661869703dfb183b6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d151165e13faaa70a584454da1df227332f50fb9 (diff) | |
| parent | 0a23f89159bea400d1ed5300056d207d6ff3e783 (diff) | |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93e807485e -s ours am: a2a976498e -s ours" into nyc-mr1-dev-plus-aosp
am: 0a23f89159 -s ours
* commit '0a23f89159bea400d1ed5300056d207d6ff3e783':
Import translations. DO NOT MERGE
Change-Id: Ib8c76c34661b3c40e2230f9390bffd696e1973df
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions