tree 96e4df21896c0eb7d6bbd74fc4741fb2867c1331
parent 05b8794654688079247c5d1d5b59dd0d288fd436
parent 5092d8c066a1a98343bbc16e33a6753e577b5e7f
author Eric Laurent <elaurent@google.com> 1296182442 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296182442 -0800

am 0ef57993: Merge "Fix issue 2988031." into gingerbread

* commit '0ef579939e6c96fcd2b42b164c5debf535a6a53b':
  Fix issue 2988031.