tree 03e7fc2c800fe551344fcd3f4f2bf29921fff0f3
parent fe3d459d9ce9b1b945b78312e7324c4b7b88688d
parent cc60b7dc3c2f1cbb8dc9917ec368e8d89cb050e7
author John Spurlock <jspurlock@google.com> 1352418445 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352418445 -0800

am cc60b7dc: am baee9ed5: am 7a73344b: Minimal fix for stuck google now.

* commit 'cc60b7dc3c2f1cbb8dc9917ec368e8d89cb050e7':
  Minimal fix for stuck google now.