ref: 19cbf5414394d0a45f06e25556433c0b6976aaca
parent: 14e3caca9a3dc1d263519ad874ee0fcc36e796df
parent: 9ba1d60bd1b0ff097b7fc88958be7ba7b589e7ca
author: Dmitry Kovalev <dkovalev@google.com>
date: Tue Jul 1 06:30:39 EDT 2014
Merge "Fix visual studio build issue"