OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 10 Aug 2012 15:53:55 +0000 (08:53 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 10 Aug 2012 15:53:55 +0000 (08:53 -0700)
commit9698d3624c5e66cbff3c89e56a1388b6b2be9c1d
tree6a26618a3c06cb8e618ffe26b9e34433b7a69f25
parent06649d02b2d6e3f147a1082c7538682f97e64a0b
parent9daa72c4e80e0ad8807597e6f9db084b13aae006
Reconcile with jb-mr1-release - do not merge

Change-Id: I73e4c2917ac2df4341096582c1a1d1eab7df8a66