summaryrefslogtreecommitdiff
path: root/python/google/protobuf/pyext/descriptor.h
AgeCommit message (Collapse)Author
2018-11-04Revert "Merge tag 'v3.0.1-javalite'"android-wear-8.0.0_r2Colin Cross
This reverts commit f4fe6ab6726e235448020c5fd203e4fc1dad728e, reversing changes made to 6e463f53f1f82dfe0a74e25ae729601a9678730c. Change-Id: I451a710a7b755868c8d6a8de56a0b9bb55fedad6
2016-06-29Integrated internal changes from GoogleAdam Cozzette
This includes all internal changes from around May 20 to now.
2015-10-05Down-integrate from google internal.Jisi Liu
2015-05-21down-integrate internal changesBo Yang
2015-02-25Down integrate from Google internal.Jisi Liu
Change-Id: I34d301133eea9c6f3a822c47d1f91e136fd33145
2014-11-10Down-integrate from internal code base.Feng Xiao
2014-10-01Replace links to code.google.com/protobuf with ↵Feng Xiao
developers.google.com/protocol-buffers
2014-08-12down integrate python opensource to svnjieluo@google.com