summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 22:08:44 (GMT)
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 22:08:44 (GMT)
commit74202ea993f28c685166d4b6c07359bcc7823873 (patch)
tree568e82009b7d4e9f69435e8b1503ebdd8d5cb7c3
parent8a5d1a1868ab1b1466df2f8d6549fae8110192bf (diff)
parent546b62cd4c1255bdb681c416d5c9b2ad22ff5e2e (diff)
downloadandroid_external_sonivox-74202ea993f28c685166d4b6c07359bcc7823873.zip
android_external_sonivox-74202ea993f28c685166d4b6c07359bcc7823873.tar.gz
android_external_sonivox-74202ea993f28c685166d4b6c07359bcc7823873.tar.bz2
am 546b62cd: am d57f7d5f: reconcile main tree with open-source eclair
Merge commit '546b62cd4c1255bdb681c416d5c9b2ad22ff5e2e' * commit '546b62cd4c1255bdb681c416d5c9b2ad22ff5e2e': android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions