aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 14:13:14 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 14:13:14 -0800
commit1dcb0f01031cd03f792f36d3e9aa871cc9e81db9 (patch)
treee427f3516c7be7a207765fc8eae5300034b1b871
parentf46b2ae9ceec0509c04de55c4a0ffe545d50350c (diff)
parent658670c53a32eb1843efde585933da2e9cb5864e (diff)
downloadclearsilver-1dcb0f01031cd03f792f36d3e9aa871cc9e81db9.tar.gz
am 658670c5: reconcile main tree with open-source eclair
Merge commit '658670c53a32eb1843efde585933da2e9cb5864e' * commit '658670c53a32eb1843efde585933da2e9cb5864e': android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions