Merge commit '96ccdc223b71f9e356d10ed3199007567996e062'

* commit '96ccdc223b71f9e356d10ed3199007567996e062':
  android-2.1_r1 snapshot

Merge commit 'a67f19deb0794784d1b841bc1900328103af03c5'

* commit 'a67f19deb0794784d1b841bc1900328103af03c5':
  Adds a few utilities to ProtoBufUtil, integrating over from mainline

Merge commit '7fea449b53848057686ac4266ee51853bda70e30'

* commit '7fea449b53848057686ac4266ee51853bda70e30':
  Revert "ProtoBuf update"

This reverts commit 9aaf507646c866ab131bf2bcd973882ff9f553cf.

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

 * Added IntMap that uses Hashtable for larger keys
 * Chagned to use IntMap to allow larger tags
 * Changed to use autoboxing for int/longs.