ref: 76035d16d9b01d15a9fa873e579bd5c923c4bec3
parent: 148c57d231397900f2a17cb15e8e3efdb6ab6560
parent: 5b724fc78e429bfc50f2c5cfe6770769ee2b7be8
author: Paul Wilkins <paulwilkins@google.com>
date: Wed Sep 24 06:32:37 EDT 2014
Merge "Fix build issue with stats enabled."