am f1c794aa: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Nov 2011 23:46:31 +0000 (15:46 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 18 Nov 2011 23:46:31 +0000 (15:46 -0800)
commit5ab3391cab90bf8da5275972ca78940d7f4ef7d2
tree2867f007dd3de64d1bbff59987e88eadfb779256
parent88a7613859c5f616989b08113458191f9bd7691b
parentf1c794aae7980595f15efd8398ae3148e8ed154f
am f1c794aa: Reconcile with ics-mr1-release

* commit 'f1c794aae7980595f15efd8398ae3148e8ed154f':