summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 08:48:21 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 08:48:21 -0800
commit98a4fb393659f9df9a12452fe25c345fbd026ff9 (patch)
tree46035e06b198764db91819d8b7a7347a90f96e2e
parentfcdec39a6813d2843855eb3ea81cbcd13931d8f5 (diff)
parent47d39e439b2caac66ca425b4eeeded8569e5ff4d (diff)
downloadti-98a4fb393659f9df9a12452fe25c345fbd026ff9.tar.gz
am 47d39e43: reconcile main tree with open-source eclair
Merge commit '47d39e439b2caac66ca425b4eeeded8569e5ff4d' into eclair-plus-aosp * commit '47d39e439b2caac66ca425b4eeeded8569e5ff4d': android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions