diff options
| author | Nick Kralevich <nnk@google.com> | 2010-06-10 11:50:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-10 11:50:51 -0700 |
| commit | 321e815893b8aaa36dd9381b62a9a2558ba8d8d8 (patch) | |
| tree | 441a8c7257e432c03f88f771f98985f95757de43 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4817cfc71dd7cb5e1ddb25bb54e490064362fdb1 (diff) | |
| parent | a2c6d5bf308181c019ade0aac6d25fe33dc3d76c (diff) | |
am a2c6d5bf: do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch
Merge commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c' into froyo-plus-aosp
* commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c':
do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions