external_protobuf.git - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add protobuf 2.2.0a sources	Wink Saville	2010-05-27	472	-0/+267949
\| \| \| \| \| \| \| \|	This is the contents of protobuf-2.2.0a.tar.bz2 from http://code.google.com/p/protobuf/downloads/list and is the base code for the javamicro code generator. Change-Id: Ie9a0440a824d615086445b6636944484b3155afa
*	The Android specific files prior to adding protobuf 2.2.0a sources.	Wink Saville	2010-05-27	3	-0/+32
\| \| \| \|	Change-Id: Ib1009c088a3815c9152385e2b764a2c7cd28317e
*	Add an empty CleanSpec.mk	Jean-Baptiste Queru	2010-03-08	1	-0/+49
\| \| \| \|	Change-Id: I7c626546a9c52c78e0e48749a34596235ee32a84
*	am 96ccdc22: reconcile main tree with open-source eclair	The Android Open Source Project	2010-02-05	0	-0/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit '96ccdc223b71f9e356d10ed3199007567996e062' * commit '96ccdc223b71f9e356d10ed3199007567996e062': android-2.1_r1 snapshot
\| *	reconcile main tree with open-source eclair	The Android Open Source Project	2010-02-05	0	-0/+0
\| \|\
\| \| *	reconcile android-2.1_r1 snapshot	The Android Open Source Project	2010-01-29	0	-0/+0
\| \| \|\ \| \|/ /
\| \| *	android-2.1_r1 snapshot	The Android Open Source Project	2010-01-12	0	-0/+0
\| \| \|
* \| \|	The j2me protobuf code is now in vendor/google; remove it here.	Dan Egnor	2009-11-13	5	-1890/+0
\|/ /
* \|	reconcile korg/master into goog/master	Jean-Baptiste Queru	2009-07-26	0	-0/+0
\|\ \
\| * \	Merge korg/donut into korg/master	Jean-Baptiste Queru	2009-07-25	2	-12/+151
\| \|\ \ \| \| \|/
* \| \|	am a67f19de: Adds a few utilities to ProtoBufUtil, integrating over from ↵	Adam Bliss	2009-06-11	2	-12/+151
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mainline Merge commit 'a67f19deb0794784d1b841bc1900328103af03c5' * commit 'a67f19deb0794784d1b841bc1900328103af03c5': Adds a few utilities to ProtoBufUtil, integrating over from mainline
\| * \|	Adds a few utilities to ProtoBufUtil, integrating over from mainline	Adam Bliss	2009-06-10	2	-12/+151
\| \| \|
* \| \|	am 7fea449b: Revert "ProtoBuf update"	Mitsuru Oshima	2009-06-10	4	-653/+171
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit '7fea449b53848057686ac4266ee51853bda70e30' * commit '7fea449b53848057686ac4266ee51853bda70e30': Revert "ProtoBuf update"
\| * \|	Revert "ProtoBuf update"	Mitsuru Oshima	2009-06-10	4	-653/+171
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 9aaf507646c866ab131bf2bcd973882ff9f553cf.
* \| \|	am 9aaf5076: ProtoBuf update * Added IntMap that uses Hashtable for larger ↵	Mitsuru Oshima	2009-06-10	4	-171/+653
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	keys * Chagned to use IntMap to allow larger tags * Changed to use autoboxing for int/longs. Merge commit '9aaf507646c866ab131bf2bcd973882ff9f553cf' * commit '9aaf507646c866ab131bf2bcd973882ff9f553cf': ProtoBuf update
\| * \|	ProtoBuf update	Mitsuru Oshima	2009-06-10	4	-171/+653
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Added IntMap that uses Hashtable for larger keys * Chagned to use IntMap to allow larger tags * Changed to use autoboxing for int/longs.
* \| \|	Merge donut into master	Jean-Baptiste Queru	2009-04-22	0	-0/+0
\|\ \ \ \| \|/ /
* \| \|	Merge branch 'open_source_no_contributions' into google_internal	The Android Open Source Project	2009-03-29	0	-0/+0
\|\ \ \ \| \|/ / \|/\| / \| \|/
\| *	Merge commit 'korg/cupcake'	The Android Open Source Project	2009-03-27	1	-0/+1
\| \|\ \| \|/ \|/\|
* \|	auto import from //branches/cupcake_rel/...@140373	The Android Open Source Project	2009-03-18	1	-0/+1
\| \|
\| *	Merge commit 'remotes/korg/cupcake' into merge	Jean-Baptiste Queru	2009-03-17	3	-44/+350
\| \|\ \| \|/ \|/\|
* \|	auto import from //depot/cupcake/@135843	The Android Open Source Project	2009-03-03	4	-0/+1750
\| \|
* \|	auto import from //depot/cupcake/@135843	The Android Open Source Project	2009-03-03	4	-1716/+0
\| \|
* \|	auto import from //depot/cupcake/@132589	The Android Open Source Project	2009-03-03	1	-38/+4
\| \|
* \|	auto import from //depot/cupcake/@137055	The Android Open Source Project	2009-03-02	1	-4/+38
\| \|
* \|	auto import from //branches/cupcake/...@132276	The Android Open Source Project	2009-02-19	3	-41/+312
\| \|
* \|	auto import from //branches/cupcake/...@130745	The Android Open Source Project	2009-02-10	1	-0/+1
\|/
*	Code drop from //branches/cupcake/...@124589	The Android Open Source Project	2008-12-17	0	-0/+0
\|
*	Initial Contribution	The Android Open Source Project	2008-10-21	4	-0/+1444