ref: 5c0f5cdda8b2700d05dcf4b3b9df0b6cd637e89c
parent: 7aa0c748b34a242ceb3609b0638674a1fe396931
parent: 91369fd9b7be7ccbc22b3b296a7ea601fb59f8d7
author: Johann Koenig <johannkoenig@google.com>
date: Mon Jul 25 15:44:04 EDT 2016
Merge "Fix compilation error under Clang 4.0."