tree cdd965daf43071a86c3965e026bf567e11873e35
parent cab8e3f6a68d47e56d2274bbafb18277afc2fa15
parent a5cbeea5a17ce18e93edcdd8cac92d105cc1a19d
author The Android Open Source Project <initial-contribution@android.com> 1329420327 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329420327 -0800

am a5cbeea5: am 2e88f403: Reconcile with ics-mr1-release

* commit 'a5cbeea5a17ce18e93edcdd8cac92d105cc1a19d':