OSDN Git Service

am e869ca96: (-s ours) CherryPick f9e455 from master to mr0. do not merge.
authorXavier Ducrohet <xav@android.com>
Mon, 24 Oct 2011 20:32:30 +0000 (13:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Oct 2011 20:32:30 +0000 (13:32 -0700)
commitf2ec33a7773f561388ab6247b62f2fdacbdd1e2c
tree28eee3f42811afd37db117e8ea5ec72270f61958
parent32c1a95f1836aaf402a8e804efc6b0c20f6398d9
parentc9c85fb2d246799ee40dc2373b5322625a74f47e
am e869ca96: (-s ours) CherryPick f9e455 from master to mr0. do not merge.

* commit 'e869ca9626146265bbb2b5043018dfe532e0661f':
  CherryPick f9e455 from master to mr0. do not merge.