tree 015533db54b1d3cd060159175e09e71fbcd0cf83
parent 44d7989abfe41ffa2d4a5cfba8c0d2f880ac9b8d
parent 82992b7270842637d1af3dcc7c9ae954bdfa312c
author Hiroshi Yamauchi <yamauchi@google.com> 1429056661 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429056661 +0000

am 82992b72: Merge "Fix javadoc error in Debug.getRuntimeStats()."

* commit '82992b7270842637d1af3dcc7c9ae954bdfa312c':
  Fix javadoc error in Debug.getRuntimeStats().