* commit '9459b5c45b0ad33bea9376c2afb66cf93da610ac':
  Fix enum field references with java_multiple_files.

When the java_multiple_files option is on, enums are placed in java
class files based on the name of the original enum type. This fixes
field references to such enum values to point to the correct class
name when setting the default.

Change-Id: I51a2e251c0d0ab1e45a182ba849d314232a74bac

* commit '6f59b38386c8ff883c8e9e0a76068fa07d95bfb1':
  Add toString() method to MessageNano.

am 4e76e72b: Merge "Fix javanano compiler generating uncompileable java code. This happened for enums when java_multiple_files=true."

* commit '4e76e72b03f6dafc9ad650864b6a12b665801b9b':
  Fix javanano compiler generating uncompileable java code. This happened for enums when java_multiple_files=true.

Merge "Fix javanano compiler generating uncompileable java code. This happened for enums when java_multiple_files=true."

for enums when java_multiple_files=true.

Change-Id: Ia6fe1a51c6a46eb9a2f29527829794076b165cb7
Signed-off-by: Brian Duff <bduff@google.com>

- All of the real work for printing the proto is actually done in
  MessageNanoPrinter.
- Uses reflection to find proto-defined fields and prints those.
- Prints all fields, even defaults and nulls.
- Also added a simple test to make sure it handles all proto types well.
  Tried not to make the test too brittle (but hey it's testing a toString()
  so how flexible can it be)

Change-Id: I3e360ef8b0561041e010c1f3445ec45ecdcd2559

* commit 'd29f87c79f34ecd6b7889cc49ca9e9d90c413634':
  Fix typos in protobuf readme.

Change-Id: Ifa3c8674482ae9575df459a3e76e9f8b4a9296b5
Signed-off-by: Matt Thrailkill <mthrailkill@google.com>

* commit 'e0ee97eaac9a0f3d74c42315a109cdc25f2fddc0':
  Don't use Arrays.copyOf in generated code.

It didn't appear until API 9 and is thus incompatible with Froyo.
Instead, allocate a new array and System.arraycopy inline.

Change-Id: I2e1cd07a4a762ef8edd5ec06ceaa1d38b302823d

* commit 'a6b79eb9618fc1774aa18a0b365e48398f23808a':
  Prevent conflicts between local and proto variable names.

* commit 'fb8f78fe6e2d757b813747d5d401a0eeb0cd478b':
  Prevent conflicts between local and proto variable names.

Prefix access to proto variable names with "this.". Also remove unused
GenerateMergingCode.

Change-Id: I5f07d3252fc385c4174d9165b64785b40f676e17

Prefix access to proto variable names with "this.". Also remove unused
GenerateMergingCode.

Change-Id: I5f07d3252fc385c4174d9165b64785b40f676e17

* commit '43325653beb4e5b6923d0380a84bf7e204be5c22':
  Nano protobufs.

Like micro protobufs except:

- No setter/getter/hazzer functions.
- Has state is not available. Outputs all fields != their default.
- CodedInputStream can only take byte[] (not InputStream).
- Repeated fields are in arrays, not ArrayList or Vector.
- Unset messages/groups are null, not "defaultInstance()".
- Required fields are always serialized.

To use:

- Link libprotobuf-java-2.3.0-nano runtime.
- Use LOCAL_PROTOC_OPTIMIZE_TYPE := nano

Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80

* commit '216c9e8681b9426e84c9e2222da5c0dd669261b2':
  Nano protobufs.

Like micro protobufs except:

- No setter/getter/hazzer functions.
- Has state is not available. Outputs all fields != their default.
- CodedInputStream can only take byte[] (not InputStream).
- Repeated fields are in arrays, not ArrayList or Vector.
- Unset messages/groups are null, not "defaultInstance()".
- Required fields are always serialized.

To use:

- Link libprotobuf-java-2.3.0-nano runtime.
- Use LOCAL_PROTOC_OPTIMIZE_TYPE := nano

Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80

* commit 'db9ab02c090cdc5d2b31399867a4052351b8793d':
  Build against the NDK for x86 and mips too.

Change-Id: I68963dc1c274c3dcf1038d4e21dc418f9554b78f

Adding new version of cpp  library,
'libprotobuf-cpp-2.3.0-full-gnustl-rtti'. Previously, c++ code
compiled against gnustl couldn't link with this library - having
both gnustl and stlport in same binary leads to nasty conflicts.

Bug: 7484202
Change-Id: Ic4fbbfc2839c4ce88bf605cf3d9cca47b146f965

Change-Id: I68963dc1c274c3dcf1038d4e21dc418f9554b78f

* commit 'a6d94785fc7c80c33de99b5a65e6a5e3a2e93fb3':
  Retire LOCAL_NDK_VERSION.

Bug: 6932421
Change-Id: Ieaad80daf4e6a4a7f058dd242f37a144e8ee9e76

Bug: 6932421
Change-Id: Ieaad80daf4e6a4a7f058dd242f37a144e8ee9e76

This change unbundled the protobuf target libraries, so they can be used
in unbundled branches.

Change-Id: Ic4948f27395b2c2b81ea120d9e2353ba9aad02a8

Bug: 5010576

Change-Id: I9a5e66066482aa0007f221bb866ac57f4eb1b70c

* commit '7cc5f59ec79718040bb1efd8be2ed12af2de5e1a':
  Unbundle protobuffer target libraries.

Change-Id: I3047d2cd10828844562fa57ae3b619fe919c6113

Change-Id: I535f93389b3b13578c9602dce3d38f1ca256e807

With gLucid protoc is installed in the base system, by renaming
our version there will be no confusion about which compiler is
being used.

Change-Id: I975e29e4444af9467c9b9600d5a2e7027f4046ae

We need this to generate code for .proto files that have
been added to external/chromium (see change I6960c18d).

Change-Id: Ic7a78273ee4f066680039d2f724e658a84869621

Merge commit '3574de1ca8301e1e13d1c89f2e2a902499d6bae9' into gingerbread-plus-aosp

* commit '3574de1ca8301e1e13d1c89f2e2a902499d6bae9':
  Remove vestigial references to StringUtf8Micro.