Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 30 Nov 2011 20:56:21 +0000 (12:56 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 30 Nov 2011 20:56:21 +0000 (12:56 -0800)
commit4fded8cfdd2bed314c5238003cdaf974be6246e9
tree705c8ff7a843e757b3c8145ef73b10fd2c8f0542
parent388c3a1b8cced74dc4c23e03881a2dc861e1e4c0
parentd8c13d669e2e80d2a52d7ae2567006afc7a765fd
Reconcile with ics-mr1-release

Change-Id: Icd5311e1b9183fbbfd51d05f6fc1719037528e3c