OSDN Git Service

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