tree 0ec7a04ba6d883eb5ef2b9e9f05e20967dbc3d2e
parent 9b7b745958328a17cdd9ad120f6bd0df7fefdab6
parent 3cd19a8a924dfd17606247c1f7445765f19a5f25
author Lorenzo Colitti <lorenzo@google.com> 1441125466 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441125466 +0000

am 3cd19a8a: Merge "Add a millisecond-variant of MonitorSleep."

* commit '3cd19a8a924dfd17606247c1f7445765f19a5f25':
  Add a millisecond-variant of MonitorSleep.