tree d0db6576e22c0d399bc855054f5c09877cf3e48a
parent 14e40f042f17ae9e596ba6db7ff11c230796f193
parent 77283ec981fc022cd26ced1e44ad21cdc0b2e4ae
author Natalie Masse <nmasse@google.com> 1416913809 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416913809 +0000

am 77283ec9: Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs

* commit '77283ec981fc022cd26ced1e44ad21cdc0b2e4ae':
  Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation