aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 08:46:54 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 08:46:54 -0800
commit246e25ae64e562d40328574156fa48f626631dcf (patch)
tree6cba51557eba418b540029ad96aeffe03859722a
parent2a217d9f5b5cfb658b710debdf9db62796c6e2a5 (diff)
parent0b3736b39bf971e1c7357183cf35dd7640c24189 (diff)
downloadastl-246e25ae64e562d40328574156fa48f626631dcf.tar.gz
am 0b3736b3: reconcile main tree with open-source eclair
Merge commit '0b3736b39bf971e1c7357183cf35dd7640c24189' into eclair-plus-aosp * commit '0b3736b39bf971e1c7357183cf35dd7640c24189': android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions