tree 5ac4d48fad39498768f95b65f5e22074c6430205
parent 0056988878ba59444110571bddc5d1307d7b02f2
parent 946d115867dacca1f8ec59fed10091c80e8cf728
author The Android Open Source Project <initial-contribution@android.com> 1321531713 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321531713 -0800

am 946d1158: am 77abe8bd: Reconcile with ics-factoryrom-2-release

* commit '946d115867dacca1f8ec59fed10091c80e8cf728':