diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-03-01 10:58:52 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-01 10:58:52 -0800 |
| commit | 4ff963328d39515e113f7c2fb4ff58ac26897239 (patch) | |
| tree | 8353c6014b6abce66d60b96e2248a9fb459fccda /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3d37ca42fe620c1cef89f7fa13cb8cac3cf356bb (diff) | |
| parent | 91dceb8143c9dab6b9b0ad38b5a3d7bb0586c677 (diff) | |
am 91dceb81: (-s ours) am 54e96c69: (-s ours) am 3333f8af: Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread
* commit '91dceb8143c9dab6b9b0ad38b5a3d7bb0586c677':
DO NOT MERGE UsbManager: squashed commit of:
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions