diff options
author | Scott Main <smain@google.com> | 2015-08-27 10:43:36 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 10:43:36 +0000 |
commit | 9d208e9d274b84636cf317aa43bae1af63face2c (patch) | |
tree | 715d547d2502de8d04de0ec12233b3183ce62c99 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | d24943d9f62170425bbeb05d10bff15b85a7dcbe (diff) | |
parent | 1112cbe67dddd719422c32fa9129118e70aa5637 (diff) |
am 1112cbe6: (-s ours) am c04d21fc: Merge "add placeholder for platform name in download button. This change depends on the following change to the script that loads the platform name... https://googleplex-android-review.git.corp.google.com/#/c/752776/" into mnc-dev
* commit '1112cbe67dddd719422c32fa9129118e70aa5637':
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions