Jean-Baptiste Queru
0422db3be9
reconcile korg/master into goog/master
16 years ago
Jean-Baptiste Queru
e68c309360
Merge korg/donut into korg/master
16 years ago
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
16 years ago
Adam Bliss
c1a443d486
Adds a few utilities to ProtoBufUtil, integrating over from mainline
16 years ago
Mitsuru Oshima
8a3fd8152c
am 7fea449b: Revert "ProtoBuf update"
...
Merge commit '7fea449b53848057686ac4266ee51853bda70e30'
* commit '7fea449b53848057686ac4266ee51853bda70e30':
Revert "ProtoBuf update"
16 years ago
Mitsuru Oshima
7e013cacd4
Revert "ProtoBuf update"
...
This reverts commit 9aaf507646c866ab131bf2bcd973882ff9f553cf.
16 years ago
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
16 years ago
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.
16 years ago
Jean-Baptiste Queru
2bf2b97a6f
Merge donut into master
16 years ago
The Android Open Source Project
42a1a5808d
Merge branch 'open_source_no_contributions' into google_internal
16 years ago
The Android Open Source Project
091ddeafa4
Merge commit 'korg/cupcake'
16 years ago
The Android Open Source Project
5a08423c59
auto import from //branches/cupcake_rel/...@140373
16 years ago
Jean-Baptiste Queru
d7af73ccec
Merge commit 'remotes/korg/cupcake' into merge
16 years ago
The Android Open Source Project
82155ace01
auto import from //depot/cupcake/@135843
16 years ago
The Android Open Source Project
778b51ced8
auto import from //depot/cupcake/@135843
16 years ago
The Android Open Source Project
a3cc5f1795
auto import from //depot/cupcake/@132589
16 years ago
The Android Open Source Project
bb7bbd7c9c
auto import from //depot/cupcake/@137055
16 years ago
The Android Open Source Project
52067f67ad
auto import from //branches/cupcake/...@132276
16 years ago
The Android Open Source Project
f83a870b18
auto import from //branches/cupcake/...@130745
16 years ago
The Android Open Source Project
35be73bfeb
Initial Contribution
16 years ago