tree 644e77b1674811c57b39420ba417ce0b3d0413f9
parent d23a8692ac96b7da73949d2dc4c549e73931609c
parent d7c7d275e77ffcae7498df7f75142e68e1b5123c
author Natalie Masse <nmasse@google.com> 1416914124 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416914124 +0000

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

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