Wink Saville
3df2fda0e4
Add protobuf 2.2.0a sources
...
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
2010-05-27 16:25:37 -07:00
Wink Saville
f9e5cc7058
The Android specific files prior to adding protobuf 2.2.0a sources.
...
Change-Id: Ib1009c088a3815c9152385e2b764a2c7cd28317e
2010-05-27 15:44:42 -07:00
The Android Open Source Project
3ac755cb94
am 96ccdc22: reconcile main tree with open-source eclair
...
Merge commit '96ccdc223b71f9e356d10ed3199007567996e062'
* commit '96ccdc223b71f9e356d10ed3199007567996e062':
android-2.1_r1 snapshot
2010-02-05 14:09:54 -08:00
The Android Open Source Project
b9ebfe977b
reconcile main tree with open-source eclair
2010-02-05 08:09:36 -08:00
The Android Open Source Project
35991647f8
reconcile android-2.1_r1 snapshot
2010-01-29 14:08:20 -08:00
Dan Egnor
95dbaa67a8
The j2me protobuf code is now in vendor/google; remove it here.
2009-11-13 17:14:51 -08:00
Jean-Baptiste Queru
0422db3be9
reconcile korg/master into goog/master
2009-07-26 11:43:55 -07:00
Jean-Baptiste Queru
e68c309360
Merge korg/donut into korg/master
2009-07-25 17:48:02 -07:00
Adam Bliss
9ed5ba9170
am a67f19de: Adds a few utilities to ProtoBufUtil, integrating over from mainline
...
Merge commit 'a67f19deb0794784d1b841bc1900328103af03c5'
* commit 'a67f19deb0794784d1b841bc1900328103af03c5':
Adds a few utilities to ProtoBufUtil, integrating over from mainline
2009-06-11 00:45:03 -07:00
Adam Bliss
c1a443d486
Adds a few utilities to ProtoBufUtil, integrating over from mainline
2009-06-10 17:40:19 -07:00
Mitsuru Oshima
8a3fd8152c
am 7fea449b: Revert "ProtoBuf update"
...
Merge commit '7fea449b53848057686ac4266ee51853bda70e30'
* commit '7fea449b53848057686ac4266ee51853bda70e30':
Revert "ProtoBuf update"
2009-06-10 16:31:48 -07:00
Mitsuru Oshima
7e013cacd4
Revert "ProtoBuf update"
...
This reverts commit 9aaf507646c866ab131bf2bcd973882ff9f553cf.
2009-06-10 16:16:02 -07:00
Mitsuru Oshima
53a2e9d2b0
am 9aaf5076: ProtoBuf update * Added IntMap that uses Hashtable for larger keys * Chagned to use IntMap to allow larger tags * Changed to use autoboxing for int/longs.
...
Merge commit '9aaf507646c866ab131bf2bcd973882ff9f553cf'
* commit '9aaf507646c866ab131bf2bcd973882ff9f553cf':
ProtoBuf update
2009-06-10 10:30:24 -07:00
Mitsuru Oshima
babfb77851
ProtoBuf update
...
* Added IntMap that uses Hashtable for larger keys
* Chagned to use IntMap to allow larger tags
* Changed to use autoboxing for int/longs.
2009-06-10 10:28:53 -07:00
Jean-Baptiste Queru
2bf2b97a6f
Merge donut into master
2009-04-22 17:12:22 -07:00
The Android Open Source Project
42a1a5808d
Merge branch 'open_source_no_contributions' into google_internal
2009-03-29 08:55:08 -07:00
The Android Open Source Project
091ddeafa4
Merge commit 'korg/cupcake'
2009-03-27 15:31:05 -07:00
The Android Open Source Project
5a08423c59
auto import from //branches/cupcake_rel/...@140373
2009-03-18 17:39:44 -07:00
Jean-Baptiste Queru
d7af73ccec
Merge commit 'remotes/korg/cupcake' into merge
2009-03-17 17:37:28 -07:00
The Android Open Source Project
82155ace01
auto import from //depot/cupcake/@135843
2009-03-03 19:30:31 -08:00
The Android Open Source Project
778b51ced8
auto import from //depot/cupcake/@135843
2009-03-03 18:28:35 -08:00
The Android Open Source Project
a3cc5f1795
auto import from //depot/cupcake/@132589
2009-03-03 14:04:14 -08:00
The Android Open Source Project
bb7bbd7c9c
auto import from //depot/cupcake/@137055
2009-03-02 22:54:29 -08:00
The Android Open Source Project
52067f67ad
auto import from //branches/cupcake/...@132276
2009-02-19 10:57:31 -08:00
The Android Open Source Project
f83a870b18
auto import from //branches/cupcake/...@130745
2009-02-10 15:43:59 -08:00
The Android Open Source Project
35be73bfeb
Initial Contribution
2008-10-21 07:00:00 -07:00
