OSDN Git Service

am e6d15c5f: am b8062e17: am 0a310052: resolved conflicts for merge of f3565212 to...
authorrepo sync <enh@google.com>
Sun, 2 May 2010 23:15:37 +0000 (16:15 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 2 May 2010 23:15:37 +0000 (16:15 -0700)
commit23498ca0a60505d5a38c37cc770cd7e4a7cf50f0
tree0d9747818a30e1d7c635e0cce2f5a1100d5ec546
parentcfb42287277a188ecefa02d0d64f64a12a1909e1
parente6d15c5f2f021ff61a33961553e9373124aa791c
am e6d15c5f: am b8062e17: am 0a310052: resolved conflicts for merge of f3565212 to froyo-plus-aosp