tree 9175d87a70108d4daf061892c82e851164b655f7
parent a49d59803e37c8e039e701c888a450e3d23a6b1e
parent 8e1d97112f1dd6379cc7441c8afef411b36ea146
author The Android Open Source Project <initial-contribution@android.com> 1322003886 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322003886 -0800

am 8e1d9711: am 8180c9e6: Reconcile with ics-mr0-release

* commit '8e1d97112f1dd6379cc7441c8afef411b36ea146':