diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-03-01 10:58:49 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-01 10:58:49 -0800 |
| commit | 3d37ca42fe620c1cef89f7fa13cb8cac3cf356bb (patch) | |
| tree | 8353c6014b6abce66d60b96e2248a9fb459fccda /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 52c98b41d6fb5e12ed2e5eaccb75c0b7013649c6 (diff) | |
| parent | 8697f397e29cdfb90f84fab584eff9edc2b0dc6f (diff) | |
am 8697f397: (-s ours) am f41768c5: (-s ours) am f7b99b32: Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread
* commit '8697f397e29cdfb90f84fab584eff9edc2b0dc6f':
Give system server permission to access USB. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions