tree 1c2da24ca24112d44999e889d32f500a21475b4d
parent 377ac63a07e3312ae1e8bfa85415539fce2677c5
parent 4bb374bb359c01055ad1f35a9424a12dcadd2d2b
author Hiroshi Yamauchi <yamauchi@google.com> 1429058427 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429058427 +0000

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

* commit '4bb374bb359c01055ad1f35a9424a12dcadd2d2b':
  Fix javadoc error in Debug.getRuntimeStats().