tree 161ae4c8f0995b05e9c3fbbd00fcc31eb5582a53
parent e06f24ef729d36330b92a87f9e4b2b60c3a12d1e
parent 6082880a0e71b01f14b4606cdbe9b9311014e450
author Daisuke Miyakawa <dmiyakawa@google.com> 1320408241 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320408241 +0000

am 6082880a: am 13a75ecb: Re-introduce workaround for issue 3090362

* commit '6082880a0e71b01f14b4606cdbe9b9311014e450':
  Re-introduce workaround for issue 3090362