tree 882da7e2f63b38d5f3b32ec1a16f816b538b73d4
parent f71ba0023279d51f4ea129b2a844f7a7141b8855
parent c5765b5497a49f665f50e62107cbea029954d490
author The Android Open Source Project <initial-contribution@android.com> 1330645879 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330645879 -0800

am c5765b54: am 9a2c5443: Reconcile with ics-mr1-release

* commit 'c5765b5497a49f665f50e62107cbea029954d490':