Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Dec 2011 18:22:21 +0000 (10:22 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Dec 2011 18:22:21 +0000 (10:22 -0800)
commit13a089576461d61a49e6770c41faa9afcdcc8816
tree7701b682183f4dff1682e83de368ebd43ac7e5da
parenta318a7fc77521dae0ea4afdc087dd30973e89f50
parentd8c13d669e2e80d2a52d7ae2567006afc7a765fd
Reconcile with ics-mr1-release

Change-Id: I994f92ebc9d80a912db2c4f1aa9100ba94daad5f