tree 002423fe677a48e39533df4804718d43ba8fe5da
parent e33f810a19d5db5b5c5a67eceeb12a5bc1a51b09
parent 18428a79810761e68d93eeb33d6032d84abdd25a
author Adam Cohen <adamcohen@google.com> 1316458083 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316458083 -0700

am 18428a79: Merge "Updating Clings. (5057945, 5056643)" into ics-factoryrom

* commit '18428a79810761e68d93eeb33d6032d84abdd25a':
  Updating Clings. (5057945, 5056643)