tree 857df3f11005a308dd6aed991271ade03d3bf7d8
parent 8b80baec0600fc1afa0806218c7eab9863907e96
parent a14cb230dad35fc4ad54dae9f5c5d4f71b89ff12
author Hyunyoung Song <hyunyoungs@google.com> 1432850495 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432850495 +0000

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

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