tree 6c15b80bb5e005019e725ee1cb34f25fee3b2cb7
parent 23d14c21554d18d8090967525575dd0bd64c84b2
parent 4ebb303a43246281c76f069989e9f3fe6af226c7
author The Android Open Source Project <initial-contribution@android.com> 1328119571 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328119571 -0800

am 4ebb303a: am 8d8c81c2: Reconcile with ics-mr1-release

* commit '4ebb303a43246281c76f069989e9f3fe6af226c7':