summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 08:45:49 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 08:45:49 -0800
commit407770b1bf4b8eb2e254ee24a2667e5302088c12 (patch)
tree1a0e54b663c402c7cfa05d4ffbea438e44062627
parent3bac1d8ae3db3abebdfd9b07ab3fce7c332635d2 (diff)
parentb08657bdff52127bc8c4e89fa55cb39608268cb5 (diff)
downloadApplicationsProvider-407770b1bf4b8eb2e254ee24a2667e5302088c12.tar.gz
am b08657bd: reconcile main tree with open-source eclair
Merge commit 'b08657bdff52127bc8c4e89fa55cb39608268cb5' into eclair-plus-aosp * commit 'b08657bdff52127bc8c4e89fa55cb39608268cb5': android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions