tree 5634b12eb6c4a485d70d6d89272176f22d5a29a5
parent 6b1cf642fc5bda2dfaea2571b24241bd3c2109b4
parent 35eb89097f4f555dc03d4d406359a9ebfa64144d
author Guang Zhu <guangzhu@google.com> 1412371963 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412371963 +0000

am 35eb8909: am ba5df0d0: Merge "Prevent monkey from triggering bugreport" into lmp-dev

* commit '35eb89097f4f555dc03d4d406359a9ebfa64144d':
  Prevent monkey from triggering bugreport