diff options
author | Casey Dahlin <sadmac@google.com> | 2015-09-02 23:20:40 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-02 23:20:40 +0000 |
commit | 1be040fb7d849762bf31bf9f898a4a004015aeb1 (patch) | |
tree | ac47d95dc535db568416425806cf4850feea321e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 1ef20d6221b7d752e636653df7798f6f4fb5ff06 (diff) | |
parent | b15623cf1c63d33fdd60c6046312c88cda961eb6 (diff) |
am b15623cf: resolved conflicts for merge of 9483748a to stage-aosp-master
* commit 'b15623cf1c63d33fdd60c6046312c88cda961eb6':
Delete outdated options tests
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions