tree 8ead682439a320615d8352af030dc8635f22fab7
parent c6170a96e3973c61fd062bb65ffd4e7c758b6cf0
parent 0b3cfc7981fed468f7dec27eb7be1739d17cc171
author Jisi Liu <liujisi@google.com> 1425433865 -0800
committer Jisi Liu <liujisi@google.com> 1425433865 -0800

Merge pull request #225 from google/post-alpha2-integrate

Post alpha2 integrate from google internal for C++ and Java