tree ae37c7f68d9e652ad6fdd5d8d5da87c478495db0
parent 4fc5c95c966615b971a8d67dc63b384ae691fb11
parent da491f048fb33b572713b4287436c1cac6898670
author Scott Kennedy <skennedy@google.com> 1365208549 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365208549 -0700

am da491f04: Prevent a potential ANR

* commit 'da491f048fb33b572713b4287436c1cac6898670':
  Prevent a potential ANR