tree 6536a7238976807f0157b8794337bbfb18b7ac69
parent e109d65b35a6c2ec1d946291827d1ae7927eebb1
parent ae6cfb6de308e01325e52092d1846c39cc86070a
author The Android Open Source Project <initial-contribution@android.com> 1329415600 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329415600 -0800

am ae6cfb6d: Reconcile with ics-mr1-release

* commit 'ae6cfb6de308e01325e52092d1846c39cc86070a':