tree c4a7ea4a1ae15d4c0d69381ad6c3d90459f34c87
parent f2b45aa676a154ddb3649e3b95d16f6b82392dec
parent 6e271c76b6906da529804c3672115a9a88fd8e30
author The Android Open Source Project <initial-contribution@android.com> 1332780551 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1332780551 -0700

am 6e271c76: Reconcile with ics-mr1-release

* commit '6e271c76b6906da529804c3672115a9a88fd8e30':
  IMM76D
  IMM76C