tree 6536a7238976807f0157b8794337bbfb18b7ac69
parent 1636ba2f40fe38188840c64978bc1d29008ed27e
parent 66e6a523b87d74b053c9a5d2289018db22739980
author The Android Open Source Project <initial-contribution@android.com> 1328119269 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328119269 -0800

am 66e6a523: Reconcile with ics-mr1-release

* commit '66e6a523b87d74b053c9a5d2289018db22739980':