tree 0b3c9786936e1171a37f060cfe9577e713dcf9e1
parent 51c23674ab6340d7a2f2be6b3ff515e7033e118a
author John Reck <jreck@google.com> 1424385410 -0800
committer The Android Automerger <android-build@google.com> 1431563359 -0700

DO NOT MERGE Backport of limited jank-tracking metrics

Bug: 19821830

Cherry-pick of ba6adf66d3c44c0aa2fd8a224862ff1901d64300
Cherry-pick of e70c5754d01f2ab0ff47ea3eabaa88aca5ed2a36

Change-Id: Id342fa0ab345f204bec58acf45ce72f6de950cfb