tree 14afd318b9bf5f4e62ac5b52783954cc36624435
parent 7b09e7a9f3ef804e9cd159023b64eac1ef8b7931
parent d83a598c392af8daf9c82f28b5c920955712f528
author Hiroshi Yamauchi <yamauchi@google.com> 1429057498 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429057498 +0000

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

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