summaryrefslogtreecommitdiffstats
path: root/libmincrypt/tools
diff options
context:
space:
mode:
authorAndroid Git Automerger <android-git-automerger@android.com>2010-01-27 18:40:16 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-01-27 18:40:16 -0800
commit9aa6b0453321cc542d3b0eefd6563b4614292f4d (patch)
tree9a826463841723544454a02d3e048dbcb4b8c552 /libmincrypt/tools
parent4544a9f7b46aab4c7a261f321ffdd35711d62099 (diff)
parent114e398f66bf5d521721abfa1933dc989bb5a135 (diff)
downloadsystem_core-9aa6b0453321cc542d3b0eefd6563b4614292f4d.zip
system_core-9aa6b0453321cc542d3b0eefd6563b4614292f4d.tar.gz
system_core-9aa6b0453321cc542d3b0eefd6563b4614292f4d.tar.bz2
am 114e398f: Merge commit \'f71f068fb9082ad78c78493c1295074e88a5526c\' into eclair-plus-aosp
Merge commit '114e398f66bf5d521721abfa1933dc989bb5a135' * commit '114e398f66bf5d521721abfa1933dc989bb5a135': Add DELL's USB Vendor ID to adb - DO NOT MERGE
Diffstat (limited to 'libmincrypt/tools')
0 files changed, 0 insertions, 0 deletions