OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 10 Nov 2011 22:35:21 +0000 (14:35 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 10 Nov 2011 22:35:21 +0000 (14:35 -0800)
commit5e939e957a0e0257950c28ffde80487b1598b5e7
tree0336b3232a82bca20a8f2b62b66430fa767f534a
parent02e827f81b1a31abb7f4c8e14757ee641b5815d1
parent6fec43c34ebe4645c60af01424514d2170a34566
Reconcile with ics-mr1-release

Change-Id: I63807d2f883382fa765e5eefe7fd17ac3cbcbe67