tree 161ae4c8f0995b05e9c3fbbd00fcc31eb5582a53
parent 6ce6194384b6ebf2dc264f61289d740b82dd65e2
parent 13a75ecbb8d8f6b4658dff832133d0fba574d62f
author Daisuke Miyakawa <dmiyakawa@google.com> 1320407959 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320407959 +0000

am 13a75ecb: Re-introduce workaround for issue 3090362

* commit '13a75ecbb8d8f6b4658dff832133d0fba574d62f':
  Re-introduce workaround for issue 3090362