summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 14:22:48 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 14:22:48 -0800
commita9765b523fbd66c698172bd6140e454ffa397842 (patch)
tree4ee1d485f5b99abb55ab24218064ad8a32af96dc
parentd05e827b5bdc80384035d87391d066434677d34f (diff)
parent98a4fb393659f9df9a12452fe25c345fbd026ff9 (diff)
downloadti-a9765b523fbd66c698172bd6140e454ffa397842.tar.gz
am 98a4fb39: am 47d39e43: reconcile main tree with open-source eclair
Merge commit '98a4fb393659f9df9a12452fe25c345fbd026ff9' * commit '98a4fb393659f9df9a12452fe25c345fbd026ff9': android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions