OSDN Git Service

am 1fed4884: am 559f26b0: (-s ours) Move to 1.6_r2 (DO NOT MERGE)
authorXavier Ducrohet <xav@android.com>
Wed, 30 Sep 2009 01:36:07 +0000 (18:36 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Sep 2009 01:36:07 +0000 (18:36 -0700)
commitdad7d042a67dddd78073640eecac2a6ae17e5324
tree980c4d5a8e6f9bbbba3a9f11cae2e5b358c67f76
parent3ec1b9c347262c5b51bea56a7632b607a90bfbc5
parent3c200009cb42dd71bbf41f708ddc4a40bcf1ddfd
am 1fed4884: am 559f26b0: (-s ours) Move to 1.6_r2 (DO NOT MERGE)

Merge commit '1fed48849dcadedb68211c5d55c1b452d05b98bc' into eclair-plus-aosp

* commit '1fed48849dcadedb68211c5d55c1b452d05b98bc':
  Move to 1.6_r2 (DO NOT MERGE)