| commit | 8a07768ec21d93c04dd315cac7a393a406618ccc | [log] [tgz] |
|---|---|---|
| author | Bertrand Simonnet <bsimonnet@google.com> | Thu Aug 27 11:51:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:51:41 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 7b57010bf0ade02060ee0a3d3602015f5a555acf [diff] | |
| parent | 0a2835fe574c55e43861bf35d42cf26f197ac995 [diff] |
am a3400a2c: (-s ours) am 1ed51e42: am 9372228f: Merge "metrics: Consolidate constants in constants.h." * commit 'a3400a2c7af8c5d952a88f497e41fbe437bf25c6':