Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 31 Oct 2011 20:19:37 +0000 (13:19 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 31 Oct 2011 20:19:37 +0000 (13:19 -0700)
commite0c780db99e1fc38f9cc272063a7d878bcce3ce1
tree2cff0b5e207cbabf68a6ed12fb8138003b72be32
parentc8656e03c8eaeaae4915880eb0717b384fa630b2
parent6a874d4346a6b60c8872c718f9d1fe9a418ba20a
Reconcile with ics-mr1-release

Change-Id: I1746d39ab2f48b064aec9fc11f546dd74c48a57f