aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Nano protobufs.Ulas Kirazci2013-04-0133-0/+7904
* Build against the NDK for x86 and mips too.Ying Wang2012-12-141-6/+8
* Retire LOCAL_NDK_VERSION.Ying Wang2012-08-141-9/+6
* Build the target protobuf libraries against the NDKYing Wang2012-06-151-12/+17
* Remove the simulator target from all makefiles.Jeff Brown2011-07-111-6/+0
* am 7cc5f59e: Unbundle protobuffer target libraries.Ying Wang2011-02-070-0/+0
|\
| * Unbundle protobuffer target libraries.Ying Wang2011-02-071-0/+2
* | Unbundle protobuffer target libraries.Ying Wang2011-01-261-0/+2
|/
* Rename protoc to aprotoc.Wink Saville2010-11-051-3/+4
* Build the protocol buffer compiler 'protoc'.Iain Merrick2010-11-021-0/+94
* am 3574de1c: Remove vestigial references to StringUtf8Micro.Wink Saville2010-10-071-4/+3
|\
| * Remove vestigial references to StringUtf8Micro.Wink Saville2010-10-061-4/+3
* | merge from gingerbreadJean-Baptiste Queru2010-10-051-0/+4
|\|
| * Make these modules optional.Jean-Baptiste Queru2010-10-051-0/+4
|/
* Make protobuf usable by host-side java appsOmari Stephens2010-09-301-55/+80
* Add libprotobuf-cpp-2.3.0-full.Wink Saville2010-06-281-16/+83
* Changed speed optimization for strings.Wink Saville2010-06-071-832/+0
* Add libprotobuf-java-2.3.0-lite.Wink Saville2010-06-041-1/+23
* Skip stlport for simulatorKenny Root2010-06-041-2/+7
* Merge "Add libprotobuf-cpp-2.3.0-lite"Wink Saville2010-06-031-2/+55
|\
| * Add libprotobuf-cpp-2.3.0-liteWink Saville2010-06-031-2/+55
|/
* Add support for Java micro protobuf's to protobuf-2.3.0.Wink Saville2010-05-292-0/+1006
* Add protobuf 2.3.0 sourcesWink Saville2010-05-292-1006/+1
* Add support for Java micro protobuf's to protobuf-2.2.0a.Wink Saville2010-05-283-3/+1014
* Add protobuf 2.2.0a sourcesWink Saville2010-05-271-0/+96
* The Android specific files prior to adding protobuf 2.2.0a sources.Wink Saville2010-05-271-0/+18
* am 96ccdc22: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
|\
| * reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
| |\
| | * reconcile android-2.1_r1 snapshotThe Android Open Source Project2010-01-290-0/+0
| |/|
* | | The j2me protobuf code is now in vendor/google; remove it here.Dan Egnor2009-11-135-1890/+0
|/ /
* | reconcile korg/master into goog/masterJean-Baptiste Queru2009-07-260-0/+0
|\ \
| * | Merge korg/donut into korg/masterJean-Baptiste Queru2009-07-252-12/+151
| |\|
* | | am a67f19de: Adds a few utilities to ProtoBufUtil, integrating over from main...Adam Bliss2009-06-112-12/+151
|\ \ \ | | |/ | |/|
| * | Adds a few utilities to ProtoBufUtil, integrating over from mainlineAdam Bliss2009-06-102-12/+151
* | | am 7fea449b: Revert "ProtoBuf update"Mitsuru Oshima2009-06-104-653/+171
|\| |
| * | Revert "ProtoBuf update"Mitsuru Oshima2009-06-104-653/+171
* | | am 9aaf5076: ProtoBuf update * Added IntMap that uses Hashtable for larger k...Mitsuru Oshima2009-06-104-171/+653
|\| |
| * | ProtoBuf updateMitsuru Oshima2009-06-104-171/+653
* | | Merge donut into masterJean-Baptiste Queru2009-04-220-0/+0
|\| |
* | | Merge branch 'open_source_no_contributions' into google_internalThe Android Open Source Project2009-03-290-0/+0
|\ \ \ | |/ / |/| / | |/
| * Merge commit 'korg/cupcake'The Android Open Source Project2009-03-271-0/+1
| |\ | |/ |/|
* | auto import from //branches/cupcake_rel/...@140373The Android Open Source Project2009-03-181-0/+1
| * Merge commit 'remotes/korg/cupcake' into mergeJean-Baptiste Queru2009-03-173-44/+350
| |\ | |/ |/|
* | auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-034-0/+1750
* | auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-034-1716/+0
* | auto import from //depot/cupcake/@132589The Android Open Source Project2009-03-031-38/+4
* | auto import from //depot/cupcake/@137055The Android Open Source Project2009-03-021-4/+38
* | auto import from //branches/cupcake/...@132276The Android Open Source Project2009-02-193-41/+312
* | auto import from //branches/cupcake/...@130745The Android Open Source Project2009-02-101-0/+1
|/
* Initial ContributionThe Android Open Source Project2008-10-214-0/+1444