am 49fc21c6: (-s ours) am 4c0ebdf2: am 15b8a778: Merge branch \'rewrite-metrics\' into merge-metrics

* commit '49fc21c60e5e791b3fa1794675ba9435ded23e73':
This commit is contained in:
Bill Yi 2015-08-27 11:47:33 +00:00 committed by Android Git Automerger
commit a4d8266e19

Diff content is not available