summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-03-02 17:24:14 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-02 17:24:14 -0800
commit093430fd5dbbdc6f5e0de6f25f6f9bb381cdd239 (patch)
treee9a7fd6aeff4a120049186e84b4ee48ead08e1e5 /core/java
parent17fc2ce479b70a539cf3aaf0e89829ad6eedc2b6 (diff)
parentb13581a9dab07ccd1841890e0443b9cfe0805679 (diff)
downloadframeworks_base-093430fd5dbbdc6f5e0de6f25f6f9bb381cdd239.zip
frameworks_base-093430fd5dbbdc6f5e0de6f25f6f9bb381cdd239.tar.gz
frameworks_base-093430fd5dbbdc6f5e0de6f25f6f9bb381cdd239.tar.bz2
am b13581a9: (-s ours) am 1110748b: DO NOT MERGE: USB accessory support library
* commit 'b13581a9dab07ccd1841890e0443b9cfe0805679': DO NOT MERGE: USB accessory support library
Diffstat (limited to 'core/java')
0 files changed, 0 insertions, 0 deletions