am a3400a2c: (-s ours) am 1ed51e42: am 9372228f: Merge "metrics: Consolidate constants in constants.h."

* commit 'a3400a2c7af8c5d952a88f497e41fbe437bf25c6':
This commit is contained in:
Bertrand Simonnet 2015-08-27 11:51:41 +00:00 committed by Android Git Automerger
commit 95d56ba2c8

Diff Content Not Available