Commit graph

16 commits

Author SHA1 Message Date
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