OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 12 Jan 2012 16:56:17 +0000 (08:56 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 12 Jan 2012 16:56:17 +0000 (08:56 -0800)
commitbc08dd57fe03b29d5acf53ab21e382b8c5600d33
tree0ddf435e065f725aebbd1a726eb1087f6e5decfb
parenta7cbd8e1a52c307cb8aac7d06a777ba2713fed82
parent7382d6a1b92a54b9a002eb5d4bcc1dcac651c176
Reconcile with ics-mr1-release

Change-Id: Ie242914fa4cfdf35675bbd2777f0817186860526