Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 16:49:46 +0000 (08:49 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 16:49:46 +0000 (08:49 -0800)
commit65eba62ea5edf2bd9a8b711f4ccac07e0c61ceff
treea68d6bcd2ae13b1c4ba02c550a4ce6c9579fd6b8
parent1b32ddfd35e54b0a6ef1e43ca35dbc1547e5676a
parent495239e683a728957c890c124b239f9b7b8ef5a8
Reconcile with ics-mr1-release

Change-Id: I35a0a0f15feed2406d60d77de84f0c4d13f0fb9e