tree 557bf6298d995778375b9c7b53094c601b560211
parent cef46e115a3e1d23800eab70c0f704aba8bbfd96
parent c61207492efa36244ffa16cc5b394e71888e4c0f
author Jie Luo <anandolee@gmail.com> 1460052305 -0700
committer Jie Luo <anandolee@gmail.com> 1460052305 -0700

Merge pull request #1392 from anandolee/master

Sync the manually integrate changes in google3/third_party