am 5c9f3579: am f30fae63: Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread

Merge commit '5c9f35799422d818f34f814c76c2acd8c939a40c'

* commit '5c9f35799422d818f34f814c76c2acd8c939a40c':
  Add a check to track a problem the monkey script has been triggering.
tree: 231b23f58a891c0c1db02e1982d9a21a6e302eda
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/