tree 888d034f3d0d51fab15dc94cd8e95bccd16b4026
parent df7f660177ca8d390379eab621aa2cbd2ea0bfbe
parent 534ea47ffd3a0c3c2e2c883200926393110d174c
author Adam Cohen <adamcohen@google.com> 1337214137 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337214137 -0700

am 534ea47f: Merge "Yet another attempt to fix (issue 6282761)" into jb-dev

* commit '534ea47ffd3a0c3c2e2c883200926393110d174c':
  Yet another attempt to fix (issue 6282761)