tree ff90681cc760c964aa4b00e34b1eb95b7c22014c
parent 7fbdc7f6ecfff38693e4ca337984b591a8560574
parent 9c0a1003bd676121cf9b1c942ecebd5b486290d5
author Eric Laurent <elaurent@google.com> 1296757704 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296757704 -0800

am 9c0a1003: Merge "Fix issue 3371080" into honeycomb

* commit '9c0a1003bd676121cf9b1c942ecebd5b486290d5':
  Fix issue 3371080