tree 3e07709eaaed8f7de7674c0a5b7741e9452bb6fd
parent 6173b1c007ef4f778c300fca1990d595a7a491ef
parent 958e00db87e8b6efea12df62a5634d99583ff8eb
author The Android Open Source Project <initial-contribution@android.com> 1319563690 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1319563690 -0700

am 958e00db: Reconcile with ics-mr0-release

* commit '958e00db87e8b6efea12df62a5634d99583ff8eb':
  ICL25
  ICL24D