4 commits

Author	SHA1	Message	Date
Feng Xiao	d36c0c538a	Down-integrate from google3.	2017-03-29 14:33:05 -07:00
Adam Cozzette	5a76e633ea	Integrated internal changes from Google	2016-11-17 16:59:59 -08:00
Jisi Liu	3b3c8abb96	Integrate google internal changes.	2016-03-30 11:39:59 -07:00
Feng Xiao	e841bac4fc	Down-integrate from internal code base.	2015-12-11 17:10:28 -08:00