OSDN Git Service

am 6a2d62c1: Merge "Manually merge change #111620 from tc3 to mainline, to keep the"
authorGlenn Kasten <gkasten@android.com>
Wed, 17 Oct 2012 22:07:05 +0000 (15:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 17 Oct 2012 22:07:05 +0000 (15:07 -0700)
commitdfb9d42f78e0feb1168fc88c526f7401284a9b5a
treece360aa36fe2691d8ffee36095732c92427ee662
parent98d172313eb675b2a1960059527518a8609b2fbe
parent6a2d62c1a972da25de53b1718c165f2b7df85a0e
am 6a2d62c1: Merge "Manually merge change #111620 from tc3 to mainline, to keep the"

* commit '6a2d62c1a972da25de53b1718c165f2b7df85a0e':
  Manually merge change #111620 from tc3 to mainline, to keep the