tree 89d49caec7cc4042e3ebb9e287722f5ac5071980
parent 55a2395004e3ab45bd6e27b3b1ff528aa828bc28
parent 22057e06ac7fd00025c32e6e2c017fc8deff63cc
author Glenn Kasten <gkasten@google.com> 1438446908 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438446908 +0000

am 22057e06: am 37f559be: Merge "Improve getTimestamp documentation" into mnc-dev

* commit '22057e06ac7fd00025c32e6e2c017fc8deff63cc':
  Improve getTimestamp documentation