am ec6745d7: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 17:09:13 +0000 (09:09 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 Feb 2012 17:09:13 +0000 (09:09 -0800)
commit6d51ec8e0cf7e811070f04f685a969fe81b12246
tree7c2dd6d73e4d7471293ecc85d59b7c35290d6cf8
parent580b1e46cd4d78220bbf17f2d5eaa94991fd220d
parentec6745d7b8d42d6687bcf54ccf430ad32f2a6bb6
am ec6745d7: Reconcile with ics-mr1-release

* commit 'ec6745d7b8d42d6687bcf54ccf430ad32f2a6bb6':