tree d90c88ec6ff73fdb4747090c6b655ea7542d157e
parent 8e1d97112f1dd6379cc7441c8afef411b36ea146
parent a9574676435b75ed2f6b2208313c348d8b4f7a13
author The Android Open Source Project <initial-contribution@android.com> 1322004374 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322004374 -0800

am a9574676: Reconcile with ics-mr0-release

* commit 'a9574676435b75ed2f6b2208313c348d8b4f7a13':