Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Dec 2011 18:21:41 +0000 (10:21 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Dec 2011 18:21:41 +0000 (10:21 -0800)
commit25bc6521d0f0753251c4be84dd395c6cbebc83cb
treed6ea6bebf4f5a4af0f78316396b1e7b45f8a3d22
parent8dd366f47258eeda07910a99b29ba681fe7464a7
parentd9f0edb3bcedadf1ffcc7df72737992074eccbb7
Reconcile with ics-mr1-release

Change-Id: I4a3249fa2e8578bc33f5f01d221ab529e580fe97