summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 14:17:14 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 14:17:14 -0800
commitefe5fc95a5f8d958df2e55be2379c32b094f2bca (patch)
treed9e7ada3abebfe3be7db955055e459283ac36e01 /src/com/android
parent735a38d2d8e1db56d91b7b754b540f8643223493 (diff)
parent9df17a63e52390bd56b955611cdde28ca8e231ef (diff)
downloadpackages_apps_Browser-efe5fc95a5f8d958df2e55be2379c32b094f2bca.tar.gz
packages_apps_Browser-efe5fc95a5f8d958df2e55be2379c32b094f2bca.tar.bz2
packages_apps_Browser-efe5fc95a5f8d958df2e55be2379c32b094f2bca.zip
am 9df17a63: am 066e5308: reconcile main tree with open-source eclair
Merge commit '9df17a63e52390bd56b955611cdde28ca8e231ef' * commit '9df17a63e52390bd56b955611cdde28ca8e231ef': android-2.1_r1 snapshot
Diffstat (limited to 'src/com/android')
0 files changed, 0 insertions, 0 deletions