commit | 7b57010bf0ade02060ee0a3d3602015f5a555acf | [log] [tgz] |
---|---|---|
author | Bertrand Simonnet <bsimonnet@google.com> | Thu Aug 27 11:51:39 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:51:39 2015 +0000 |
tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
parent | f84888ea4f0dc5b74909e6bc0d811d6adf116a7c [diff] | |
parent | 2ef6d33634f1e352a393e7fbe22979a9d417e7a9 [diff] |
am 7c269663: (-s ours) am f69a27f8: am 182673ec: Merge "metrics: Cleanup the system profile setter." * commit '7c2696630f2e5816502b7ca1e4abcb560046c31b':