aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 08:47:51 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 08:47:51 -0800
commit1cd49f1559cf2c3b0cb1294b3787c5ddb3562c8d (patch)
treeb3c445c26b137307b671757a04dd47db49860fa5
parenta2258665ddc42a94d1745b1821fc773d7aa5d8ea (diff)
parente2b8d31c2fee2ff99522dee8cf1ca46a094b4500 (diff)
downloadsample-1cd49f1559cf2c3b0cb1294b3787c5ddb3562c8d.tar.gz
am e2b8d31c: reconcile main tree with open-source eclair
Merge commit 'e2b8d31c2fee2ff99522dee8cf1ca46a094b4500' into eclair-plus-aosp * commit 'e2b8d31c2fee2ff99522dee8cf1ca46a094b4500': android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions