commit | 995592b2edeffa8d42ac386defc3f4eeac0b111c | [log] [tgz] |
---|---|---|
author | Bertrand Simonnet <bsimonnet@google.com> | Thu Aug 27 14:33:30 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:33:30 2015 +0000 |
tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
parent | 589ef93cf2fec2a424f1489cf73291080c9e3cfa [diff] | |
parent | 8a07768ec21d93c04dd315cac7a393a406618ccc [diff] |
am 95d56ba2: am a3400a2c: (-s ours) am 1ed51e42: am 9372228f: Merge "metrics: Consolidate constants in constants.h." * commit '95d56ba2c8b75145d4da5977b14feb85552039c7':