tree 960e6b20536d38ce8c091b3b74f263683b16c229
parent 258d0e805ee63685b807b5dae43efc5ecc97179e
parent ae0bb04aa4b26abd27dd127ea35a6b3cd21caeac
author Eric Laurent <elaurent@google.com> 1287104590 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287104590 -0700

am ae0bb04a: Merge "Fix issue 3098850" into gingerbread

Merge commit 'ae0bb04aa4b26abd27dd127ea35a6b3cd21caeac' into gingerbread-plus-aosp

* commit 'ae0bb04aa4b26abd27dd127ea35a6b3cd21caeac':
  Fix issue 3098850