tree 96c6f3596a845504cf0fedf19bfdcd3f4d922a20
parent 5619edf52e4b885a37f11d1d6fbd281527110126
parent eabf77ca9621393a0a32e16e7640888de08f1ea9
author Hyunyoung Song <hyunyoungs@google.com> 1432852228 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432852228 +0000

am eabf77ca: am a14cb230: (-s ours) Merge "Guard against monkey actor test NPE inside FocusHelper b/19626762" into ub-launcher3-almonte

* commit 'eabf77ca9621393a0a32e16e7640888de08f1ea9':
  Guard against monkey actor test NPE inside FocusHelper b/19626762