aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 14:21:22 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 14:21:22 -0800
commit4a55e007ccdbd16117e4f7c34596b285864d4e5c (patch)
tree22f251dc2212af6ac2e9e4f8a276f1ecf298db1e
parent3673bae1682c5edcfd1d883640a0cb6b42400237 (diff)
parentd5ef85349a87d1105c825c3d61517fecea361d1a (diff)
downloadhcidump-4a55e007ccdbd16117e4f7c34596b285864d4e5c.tar.gz
am d5ef8534: am 6b4a6fe5: reconcile main tree with open-source eclair
Merge commit 'd5ef85349a87d1105c825c3d61517fecea361d1a' * commit 'd5ef85349a87d1105c825c3d61517fecea361d1a': android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions