tree 888d034f3d0d51fab15dc94cd8e95bccd16b4026
parent cc12d9a31dfdeae177a2fc37f2a2b8c58f38bbe6
parent a4d6531ab3091e1258320e6a76ec79d4d2e392f8
author Adam Cohen <adamcohen@google.com> 1337300270 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337300270 -0700

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

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