tree e3c12267dacc91ec4ce0858a06a1f95b82817ce9
parent e244bfb7ddb4e717796b329cab2a361e0b2988c6
parent 55b347501bd46eb1dc66dafafce73e6b9c834a78
author The Android Open Source Project <initial-contribution@android.com> 1316202900 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316202900 -0700

am 55b34750: Reconcile with ics-factoryrom-release

* commit '55b347501bd46eb1dc66dafafce73e6b9c834a78':
  DO NOT MERGE: Fixing regression where scroll position would be offset when rotated.