summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 08:23:27 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 08:23:27 -0800
commitf91bed8b6616d14bbc94fd63abcf6709d541ee39 (patch)
tree7f288bf92ba8a1e6f0845331633d8b625f6c33be
parent68f673de564d7b1f628faeca12a9b8f4233a819f (diff)
parentee67ee7420a4a3f95229f8e53780e81589540993 (diff)
downloadsrec-f91bed8b6616d14bbc94fd63abcf6709d541ee39.tar.gz
am ee67ee74: reconcile main tree with open-source eclair
Merge commit 'ee67ee7420a4a3f95229f8e53780e81589540993' into eclair-plus-aosp * commit 'ee67ee7420a4a3f95229f8e53780e81589540993': android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions