History log of /external/protobuf/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
50b8bd8e0bcbecd5e1646106e0333556179bd2e7 08-Mar-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4641295 from 411501423307c29a160affef03485fd8000b3c1d to pi-release

Change-Id: I5c3a5f74b7a0965d7f90fbc5938e280654e2c665
411501423307c29a160affef03485fd8000b3c1d 04-Mar-2018 Jiyong Park <jiyong@google.com> Build libprotobuf-java-lite only using core Java SDK APIs

libprotobuf-java-lite is now built against core Java APIs which excludes
Android-only APIs (classes under android.* packages) and private APIs.
"core_current" is a pseudo SDK which is a core Java subset of Android
SDK.

However, this lib has been using sun.misc.Unsafe which is a hidden API
and dependency to the class doesn't seem to be able to be cut easily in
the near future. In order to make it possible to build the lib with the
SDK only, a stubs library called libcore_private.stubs is defined to
provide build-time only information on the hidden APIs exclusively to
protobuf.

At runtime, the Unsafe class is provide by the OS and protobuf is linked
to the class loaded there.

Bug: 73204840
Test: m -j libprotobuf-java-lite is successful and does not show any
link-type check warning

Merged-In: I2fce2662cc65d4e57fc75bbf30ebf9f7d47c6775
(cherry picked from commit dc08924dc7262e5c06c1108f67f66e82598af806)

libcore_private.stubs cannot be built with JDK9

The package sun.misc in the stubs library is causing module name
conflict when building with JDK9.

error: package exists in another module: jdk.unsupported

Fixing the error by setting java_version to 1.7 so that modules are not
used when building the stubs lib.

Bug: 74211600
Test: EXPERIMENTAL_USE_OPENJDK9=true m -j libcore_private.stubs

Merged-In: Ifa709bef2dc8e2b11048ef96fc7517d8c25e8a7f
(cherry picked from commit 0e4379e7504849d7a2755b9a0264cd7901accc88)

libcore_private.stubs is uninstallable

Make sure that libcore_private.stubs isn't installed to the device as a
standalone jar library. The lib is meant to provide build-time only
symbol information to protobuf and thus is not runnable.

Bug: 73204840
Test: m -j libcore_private.stubs does not create
libcore_private.stubs.jar in /system/framework

Merged-In: I7c661211161937dba5ee71fdc4bb8b9f101c5a59
(cherry picked from commit 6297aad4d72232863366d62ae8799ce9cf492a43)

Don't force libcore_private.stubs to be built with java 1.7

We no longer need to build libcore_private.stubs with java 1.7, because
the library is only built for target and not for host, where it
conflicts with the module jdk.unsupported.

Bug: 74211600
Test: m -j libprotobuf-java-lite is successful. both host and target
variant of the lib is generated.
Test: EXPERIMENTAL_USE_OPENJDK9=true m -j libprotobuf-java-lite is also
successful.

Merged-In: I61a49d537ee6abad29e5661944ffc612a94465b8
(cherry picked from commit ed6d68ed9747c96d54d6773af40060e780443b1a)

Change-Id: I256652071b8a11cfbebcf6a4906546e6434f7372
ndroid.bp
ava/core/src/stubs/sun/misc/Unsafe.java
23e7c10c47f8222e169c886e40aa210ed3c6c605 28-Feb-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4625912 from 07b89888f5174bbb2af0365b5d4f392fb290eb54 to pi-release

Change-Id: I061fbc09bc63d4d30fb64cf55417aefe27f824d5
07b89888f5174bbb2af0365b5d4f392fb290eb54 27-Feb-2018 Dan Willemsen <dwillemsen@google.com> Merge "Add zlib support to protobuf" am: a69907a6b2 am: 98c4dbcacd
am: c498956983

Change-Id: I17f327f46f9f2ac5a88e948e2fe867ef85ff9ae5
c4989569836c8e35635a23f08fd2f0b34517f35c 27-Feb-2018 Dan Willemsen <dwillemsen@google.com> Merge "Add zlib support to protobuf" am: a69907a6b2
am: 98c4dbcacd

Change-Id: I465eaa85ff58dbc6c301ebbc6989644afc6ebbf1
98c4dbcacd2d0a73b96d6d0814bbeb01d08d965c 27-Feb-2018 Dan Willemsen <dwillemsen@google.com> Merge "Add zlib support to protobuf"
am: a69907a6b2

Change-Id: I11af43fb821a855bcd5bf15a97413e999de781bb
a69907a6b287fac8723b742f9a73cd5ec3c98a2d 27-Feb-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Add zlib support to protobuf"
00ceebe3333f282d74dc4eb71893f853c99964c4 07-Feb-2018 Dan Willemsen <dwillemsen@google.com> Add zlib support to protobuf

We're already including the source files for zlib support, and linking
against libz, but we haven't been turning it on.

Test: cd external/protobuf; mma
Change-Id: Ia4d0ef9f7053b163afda7efaa7c22c3ffa32d4f7
ndroid.bp
7b2f4e7521ac690574f3d58fe5bb4afd15face04 11-Feb-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4598635 from 7c08e17960f111a88f2703b823159e5f48d573bf to pi-release

Change-Id: I59944a565a77a80ddcd56dacf2afae13bff5b6f4
7c08e17960f111a88f2703b823159e5f48d573bf 08-Feb-2018 Andreas Gampe <agampe@google.com> Merge "Include <byteswap.h> on Android." am: a56b371c82 am: c1567549d0
am: 07d4682044

Change-Id: I056b48a81b24f63758b617943896eafe7106be56
07d4682044d27d7535a405cfda61b1696e069382 08-Feb-2018 Andreas Gampe <agampe@google.com> Merge "Include <byteswap.h> on Android." am: a56b371c82
am: c1567549d0

Change-Id: I49024d6257f23d17b7a5f8d362abd189f20ecc60
c1567549d032042700cb5189b8fd817a8efcec95 08-Feb-2018 Andreas Gampe <agampe@google.com> Merge "Include <byteswap.h> on Android."
am: a56b371c82

Change-Id: Ic51da6335a711c883f6727a4975d960e7c44b2cd
a56b371c82caba91f92f8cee1ebf9aae6564ebf5 08-Feb-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Include <byteswap.h> on Android."
7d8fe34e62296f1655a3714237a313a75b8026fe 07-Feb-2018 Andreas Gampe <agampe@google.com> Include <byteswap.h> on Android.

Android Bionic has <byteswap.h>, which defines three macros:

#define bswap_16(x) __swap16(x)
#define bswap_32(x) __swap32(x)
#define bswap_64(x) __swap64(x)

This is an early cherry-pick.

Bug: 72746797
Test: m checkbuild
Change-Id: I4f6c32c048327881e3c6483a664228bdc3437ed9
rc/google/protobuf/stubs/port.h
3f0bb29eb4efef24fce7cf124e4e3cfdb5e44556 18-Jan-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4551672 from 200c2b29943e73604e56d0efc97aaf18d18048e0 to pi-release

Change-Id: Ie6cb99660c7c9d9cb1f0b01b0774f5b58d1c6565
200c2b29943e73604e56d0efc97aaf18d18048e0 17-Jan-2018 Ross Wang <rosswang@google.com> Merge "const FieldDescriptorCompare" am: 76fb3ef233 am: 47c2f9ca7d
am: 8d5223b8e2

Change-Id: I8ebc354381ad2b41587d4f1762a558b4a0d6053c
8d5223b8e2e37a51fae06fc370d512c94a556ab8 16-Jan-2018 Ross Wang <rosswang@google.com> Merge "const FieldDescriptorCompare" am: 76fb3ef233
am: 47c2f9ca7d

Change-Id: I6661b254a382fb1ad0fca258d8b9a8e721f9db44
47c2f9ca7d814e753367da4a70e3ecbe54df2fe2 16-Jan-2018 Ross Wang <rosswang@google.com> Merge "const FieldDescriptorCompare"
am: 76fb3ef233

Change-Id: Iedca46de0103f1b9a20cf50ff90ad66849ffdf68
76fb3ef233afdb2401936faa7b3b95ce8851f4d7 16-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "const FieldDescriptorCompare"
3ef60bb14d31a3dd0e7ef0dabe55445369bbeb54 18-Feb-2017 Ross Wang <rosswang@google.com> const FieldDescriptorCompare

Clang now validates that <set> comparators must have a const operator():
https://reviews.llvm.org/rL291969

Discussion:
https://groups.google.com/d/msg/protobuf/9W6zFIHaJ-4/9RrfwelpEQAJ

Test: none
Bug: 27338623
Change-Id: I0e853c3d33dd0048a768d12d51c089004c05e99c
EADME.android
EADME.version
rc/google/protobuf/compiler/java/java_file.cc
3cd3e83085ae6e8422ff5024f09583460174233c 07-Jan-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4531101 from 8e8cc90aa386cfcef40ddbfd2baa26088aa68028 to pi-release

Change-Id: I0a7798f741e2e5c49ad7ef93bb913ebd2ed2637e
8e8cc90aa386cfcef40ddbfd2baa26088aa68028 05-Jan-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Move protobuf from stlport to libc++."
5cf48fefb44b50f4a63ab6c47274e7a772727290 05-Jan-2018 Dan Albert <danalbert@google.com> Merge "Move protobuf from stlport to libc++." am: 80fc989f3e am: f02c3879e9
am: f070e1543d

Change-Id: Ia2994d39c1163a4effc2d1b6f61418229d9dff5e
f070e1543d06841f0a5e9f4b5d88478acc9dd941 05-Jan-2018 Dan Albert <danalbert@google.com> Merge "Move protobuf from stlport to libc++." am: 80fc989f3e
am: f02c3879e9

Change-Id: I69d0d34011c802d0bc903ec05ef79c6c2e859680
f02c3879e908472560b139b411487b80246f6597 05-Jan-2018 Dan Albert <danalbert@google.com> Merge "Move protobuf from stlport to libc++."
am: 80fc989f3e

Change-Id: Ic89cfd1789af0555059c5ed75e1414e3c8704244
80fc989f3e8d04525ebc8a54f3546452ceffe859 05-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Move protobuf from stlport to libc++."
7a4e8b7d20e71a427cf6d14af5f2cf14e5415432 04-Jan-2018 Dan Albert <danalbert@google.com> Move protobuf from stlport to libc++.
am: 59a36d5c0e

Change-Id: I14857f515c9e44757c4760eca53497192ea0ea8d
59a36d5c0e65c95061209489fbdf29a9cc5b0e56 04-Jan-2018 Dan Albert <danalbert@google.com> Move protobuf from stlport to libc++.

Test: make checkbuild
Bug: None
Change-Id: I134b1261253ead27250c72811143929ce767931f
ndroid.bp
dcdd1f0f93f02226287b52a7c15f02c9f320ff6a 04-Jan-2018 Dan Albert <danalbert@google.com> Move protobuf from stlport to libc++.

Test: make checkbuild
Bug: None
Change-Id: I134b1261253ead27250c72811143929ce767931f
ndroid.bp
8e024c6fa096f44c4bb6117a0141af3bf6ab1ad7 04-Jan-2018 Dan Albert <danalbert@google.com> Move protobuf from stlport to libc++.

Test: make checkbuild
Bug: None
Change-Id: I134b1261253ead27250c72811143929ce767931f
ndroid.bp
61053df39d11a63ecd7fbb96fc6fe13a93a36912 03-Jan-2018 android-build-team Robot <android-build-team-robot@google.com> Snap for 4523885 from 70acf3bd86f892ce244bb7b99a3ee33a4aac703a to pi-release

Change-Id: I57ba614d8944e9fe8ccf84b998a90ca4ee356fa0
70acf3bd86f892ce244bb7b99a3ee33a4aac703a 02-Jan-2018 Dan Albert <danalbert@google.com> Merge "Remove unused protobuf module." am: c767d0ebcb am: 6ce1990a92
am: 4f7f544ce2

Change-Id: Ifbd97058c223abcfc8ee4b6e9ed13d46546dd9a7
4f7f544ce2f3743968db5d7fdb8196b5426572ac 02-Jan-2018 Dan Albert <danalbert@google.com> Merge "Remove unused protobuf module." am: c767d0ebcb
am: 6ce1990a92

Change-Id: I9edd4747a684f4bf5e41af51fc625cd27eae6464
6ce1990a9202fb1967a08dfb980c8f889097ed1f 02-Jan-2018 Dan Albert <danalbert@google.com> Merge "Remove unused protobuf module."
am: c767d0ebcb

Change-Id: I3653d5c455a22db0b4d2991695b622b8da804e2c
c767d0ebcb11ccff383a6aab38b960caf93f1ac1 02-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Remove unused protobuf module."
a119b49d669db924c36d8d8376590601b70a9c77 21-Dec-2017 Dan Albert <danalbert@google.com> Remove unused protobuf module.

Test: make checkbuild
Bug: None
Change-Id: I6fee9f3a9bb37c92e60f71af2416363d42acf9ef
ndroid.bp
ee447f1097954694f8c9336d560b999d8e8e9c50 11-Dec-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4496165 from 2b563fb6cc882ce0e54301a94b343b1c9ca8c14e to pi-release

Change-Id: Ifdc092649f97f111ee36305c3096234f07814955
2b563fb6cc882ce0e54301a94b343b1c9ca8c14e 08-Dec-2017 Andrew Scull <ascull@google.com> Merge "Improve libprotoc support for plugins" am: 57c9ad33f2 am: c11f22c84e
am: 6c6f726a07 -s ours

Change-Id: I60007008900b29c8e73e024e677b4519658a1ed9
6c6f726a07a208e6ccdc4cb676068f5fcc6190a7 07-Dec-2017 Andrew Scull <ascull@google.com> Merge "Improve libprotoc support for plugins" am: 57c9ad33f2
am: c11f22c84e

Change-Id: Ib29d503549fdb7b8bb9faae4a26fd037e3c54bb6
c11f22c84ecd0b13fd87a318634200bcb179da22 07-Dec-2017 Andrew Scull <ascull@google.com> Merge "Improve libprotoc support for plugins"
am: 57c9ad33f2

Change-Id: Id25f588075f3e90df2b1bcdb4f849d9e94e7895f
57c9ad33f25a82fffe90bb8db51d8ddaa2941e48 07-Dec-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Improve libprotoc support for plugins"
a00a57e6eeaf4dd119727e146196d94e8f1f5a7e 14-Aug-2017 Andrew Scull <ascull@google.com> Improve libprotoc support for plugins

The protobuf documentation says "plugins written in C++ should probably
build on the API in plugin.h" which offers PluginMain to call a
CodeGenerator.

Test: Build a protobuf plugin using PluginMain from libprotoc
Merged-In: Ie08b4f3fccc8344afb67827a786ef7460d7acc62
Change-Id: Ie08b4f3fccc8344afb67827a786ef7460d7acc62
ndroid.bp
20f703c8c7a17f5d305c4b5691a67c8080e94e42 03-Dec-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4481641 from b4c7efc26528d326b82e2ab65146b8efccbc6987 to pi-release

Change-Id: Ib59970cf78d8dda776b0c55550ec9062101d1d17
b4c7efc26528d326b82e2ab65146b8efccbc6987 01-Dec-2017 Chih-hung Hsieh <chh@google.com> Merge "Add -Werror for android target." am: 48d5109850 am: 710586cf77
am: 286de5e6c9

Change-Id: Ic7181f4b5ce29e84dc375509d174b0b70334eab1
286de5e6c930017241e982c726c01b0a65adf8df 01-Dec-2017 Chih-hung Hsieh <chh@google.com> Merge "Add -Werror for android target." am: 48d5109850
am: 710586cf77

Change-Id: Ifd242f0a4d6777dbb42410b31bdbf06b9539fc38
710586cf7795352832707a1950895d69fe56204a 30-Nov-2017 Chih-hung Hsieh <chh@google.com> Merge "Add -Werror for android target."
am: 48d5109850

Change-Id: Ie9509602088f8abee6e2ab7296a04fe5d350e251
48d51098502fc304626077c557ea8afc499aebdf 30-Nov-2017 Chih-hung Hsieh <chh@google.com> Merge "Add -Werror for android target."
35ee99e1b5ffcc8033b72a8608dad452613a0a28 29-Nov-2017 Chih-Hung Hsieh <chh@google.com> Add -Werror for android target.

* The "android" target is not covered by "not_windows".

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I2ebdc6a132ac8f6b410a86badd58efa9ab6c088e
ndroid.bp
29fbc14752871e7c449c4a3d59ab2a5eb81e2d05 21-Nov-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4462748 from 2b8864ea5bc7ee7602dba577bd59684e9ed32cc1 to pi-release

Change-Id: I9d7607c7de30f94e6200daf861042500d2986aba
2b8864ea5bc7ee7602dba577bd59684e9ed32cc1 21-Nov-2017 Chih-hung Hsieh <chh@google.com> Merge "Explicit -Wno-error in external/protobuf" am: 4673083bff am: c8fc7bae0c
am: dc821da2cd

Change-Id: I96f07366d5a8d4a3b2c245aa36a79af8dbdea531
dc821da2cd4460b7848655347716c689900ca3a9 21-Nov-2017 Chih-hung Hsieh <chh@google.com> Merge "Explicit -Wno-error in external/protobuf" am: 4673083bff
am: c8fc7bae0c

Change-Id: I4d5371447297f7c4c488edefa5f530b3f6fd651b
c8fc7bae0c6635f2d1a3b47640a43d64e5b7222e 21-Nov-2017 Chih-hung Hsieh <chh@google.com> Merge "Explicit -Wno-error in external/protobuf"
am: 4673083bff

Change-Id: I2cdc3e41774371d4c22c2a4e85baa9b0836fc33b
4673083bff754937574a6a58289ef122973a5e42 21-Nov-2017 Chih-hung Hsieh <chh@google.com> Merge "Explicit -Wno-error in external/protobuf"
23800058b0521a9b197227da45b0e5043968a64e 21-Nov-2017 Chih-Hung Hsieh <chh@google.com> Explicit -Wno-error in external/protobuf

* Some gcc warnings cannot to suppressed;
use explicit -Wno-error for windows.

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I4de7d6bfd896d10d1e1000f9c3b38082705067a4
ndroid.bp
e34a833a691aa2909a02a0373bf6bab8a12a2284 13-Oct-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4393550 from 02bfd0022fcf6693ce9817ebe6811107c22a8aac to pi-release

Change-Id: I1504e54bca3aa53cf02b50a0362caf46c941f70f
02bfd0022fcf6693ce9817ebe6811107c22a8aac 12-Oct-2017 Chih-hung Hsieh <chh@google.com> Merge "Use -Werror in external/protobuf" am: 472a4b15fd am: bcc5a4247c am: f5619425c3
am: 2d5e468cd7

Change-Id: Ia393b29ea8fe8ca9c0676f48cf701b8eb45b79df
2d5e468cd76b98f9188de0710dd5d54a4eb0cf46 12-Oct-2017 Chih-hung Hsieh <chh@google.com> Merge "Use -Werror in external/protobuf" am: 472a4b15fd am: bcc5a4247c
am: f5619425c3

Change-Id: Ic3d455744d0d54fb27d90df0626008e0c20157b3
f5619425c37f29c77aafa2fbd742c918ebf7d3db 12-Oct-2017 Chih-hung Hsieh <chh@google.com> Merge "Use -Werror in external/protobuf" am: 472a4b15fd
am: bcc5a4247c

Change-Id: Id766742d658f53f3822dcf0637bb664c3287491b
bcc5a4247ca6181e823dd708462e23e942dcac34 12-Oct-2017 Chih-hung Hsieh <chh@google.com> Merge "Use -Werror in external/protobuf"
am: 472a4b15fd

Change-Id: I84892c18b12e2a5ddcc6f06b6ab11030ed1cf4ca
472a4b15fd362e2d6994c5bfa0be3a108e92fc70 12-Oct-2017 Chih-hung Hsieh <chh@google.com> Merge "Use -Werror in external/protobuf"
855e14261cc3145358d49aa98ec5254b844c4ba4 29-Sep-2017 Chih-Hung Hsieh <chh@google.com> Use -Werror in external/protobuf

* Use -Wno-error= to keep existing warnings, to fix later.
* Not for windows yet because some gcc warnings cannot be suppressed.

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I4330ef7cd10a15259e1b8f1f9bb22bcb4fe413a5
ndroid.bp
30aa3b84e017f4d659508942fcb7c317b44d345b 04-Oct-2017 android-build-team Robot <android-build-team-robot@google.com> Snap for 4375922 from 85d4917ad9871d38829aa5a11326a3520850e150 to pi-release

Change-Id: I2b4571690bb17b4ed380436186c93506c5d45f52
85d4917ad9871d38829aa5a11326a3520850e150 04-Oct-2017 Colin Cross <ccross@android.com> Merge "Convert protobuf runtimes to Android.bp" am: 78b40ce731 am: 4e95f9e84e am: 51ea07112f
am: ef461ebd77

Change-Id: I4043daf73f2c57a663c7e2e2c5dfb7a60c428f50
ef461ebd771d88d1fb3d3ed4bbbc041e6a654603 04-Oct-2017 Colin Cross <ccross@android.com> Merge "Convert protobuf runtimes to Android.bp" am: 78b40ce731 am: 4e95f9e84e
am: 51ea07112f

Change-Id: I3eddd7aeb926aa57a3f2dbfd773af4d8779c134c
51ea07112f22b5afcd7e94223d1340b927ba31a9 04-Oct-2017 Colin Cross <ccross@android.com> Merge "Convert protobuf runtimes to Android.bp" am: 78b40ce731
am: 4e95f9e84e

Change-Id: I5ea4de5a999ecb2d09f0dc7b09b0314446c1b9b6
4e95f9e84e5e45a39ef6a65f522ff7860c9a5712 04-Oct-2017 Colin Cross <ccross@android.com> Merge "Convert protobuf runtimes to Android.bp"
am: 78b40ce731

Change-Id: If66042296b8ff6012f04834e063ec5d32edda734
78b40ce73114edca9b97f4b8eb9cda85ffe2d24d 04-Oct-2017 Colin Cross <ccross@android.com> Merge "Convert protobuf runtimes to Android.bp"
8ef59df1c5709d77ad96749e00f9cfa303995eea 02-Oct-2017 Colin Cross <ccross@android.com> Convert protobuf runtimes to Android.bp

See build/soong/README.md for more information.

Converts the necessary runtime libraries to Soong to
allow Java language modules that use protobufs to be
converted to Soong.

Test: m -j checkbuild
Change-Id: I956e843dbe5ff95edfe09c0f9b42dfeae15aad29
ndroid.bp
ndroid.mk
31dd42242482be0e652f57a97e1187d21bc8ed07 30-Sep-2017 android-build-team Robot <android-build-team-robot@google.com> release-request-b4bc7b84-64b6-4176-8f16-ce17068fad13-for-git_pi-release-4370135 snap-temp-L93500000107644030

Change-Id: I27e7d9b7a51069291c222e71ce2b441a286e847f
91750c7df0f45f6fe615c3165a7a8406e5185649 29-Sep-2017 Dan Willemsen <dwillemsen@google.com> Merge "Rename libz-host -> libz" am: e68c129c44 am: 41d3b5fafa am: 491f42c7e1
am: bd0bd49ac0

Change-Id: I5d42be64ca2c0618dfeabcc211a7353d3f8fc0ce
bd0bd49ac04130f95f9c36ea85e456d162959129 29-Sep-2017 Dan Willemsen <dwillemsen@google.com> Merge "Rename libz-host -> libz" am: e68c129c44 am: 41d3b5fafa
am: 491f42c7e1

Change-Id: Ic69a695d3010c489abdbefddeb7848d2c005767d
491f42c7e1130b4ec3e76aaf9bca96bd3d3c81ee 29-Sep-2017 Dan Willemsen <dwillemsen@google.com> Merge "Rename libz-host -> libz" am: e68c129c44
am: 41d3b5fafa

Change-Id: Ib13a0c2c689e7e4b5ec577fe077331932ad44d0c
41d3b5fafa3b336dd72c63c94566664c7d98c62d 29-Sep-2017 Dan Willemsen <dwillemsen@google.com> Merge "Rename libz-host -> libz"
am: e68c129c44

Change-Id: I1fc41cdcb9e187631016c30294ac72c59cb1418f
e68c129c4413983ec95e1261b8133d3f77a0e45a 28-Sep-2017 Dan Willemsen <dwillemsen@google.com> Merge "Rename libz-host -> libz"
e93d073f0aee090e30663a99dc290a6d932b143f 28-Sep-2017 Dan Willemsen <dwillemsen@google.com> Rename libz-host -> libz

Also remove host_ldlibs -lpthread, which is a default now.

Test: m host
Change-Id: Ifee46f2f2aaf158329fca207fcc9198e27926a68
ndroid.bp
2f33a02e86f01bf818201fdbbad28087a7238316 14-Sep-2017 Justin Yun <justinyun@google.com> Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: da30efac88 am: 3bbd6e3cd4 am: 4f85477a84 -s ours
am: 6d52ff3cef -s ours

Change-Id: Iea02a27413993553e3be84bc557957c98e7dcbcd
6d52ff3cef733c60858cf2b808bb7db44ed96004 14-Sep-2017 Justin Yun <justinyun@google.com> Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: da30efac88 am: 3bbd6e3cd4
am: 4f85477a84 -s ours

Change-Id: I72e38cc26e62d02f60a0bd6d6b3f8730c1f4baf3
4f85477a842ef494b707922da8d256fa1b266729 14-Sep-2017 Justin Yun <justinyun@google.com> Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: da30efac88
am: 3bbd6e3cd4

Change-Id: I3d37ea8f49bc2f5a7a7fb2e442ed97301d478516
3bbd6e3cd41f688f969cb372836d9a8bee2a1b80 14-Sep-2017 Justin Yun <justinyun@google.com> Merge "Mark the module as VNDK or VNDK-SP in Android.bp"
am: da30efac88

Change-Id: Ie990b343996e3b6e0bcf5d2c036f9a7524fd55bd
da30efac8863fdda3cefb9eff987fe5f710a8ec8 14-Sep-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Mark the module as VNDK or VNDK-SP in Android.bp"
40ad29478d94b2e137c022028d4af315cfedabc9 24-Jul-2017 Justin Yun <justinyun@google.com> Mark the module as VNDK or VNDK-SP in Android.bp

As a VNDK/VNDK-SP module, Android.bp must have 'vndk' tag as well
as 'vendor_available: true'.

For a VNDK module, the 'vndk' tag has 'enabled: true'.
It will be installed system/lib(64)/vndk as a vendor variant.

For a VNDK-SP module, the 'vndk' tag has
'support_system_process: true' as well as 'enabled: true'.
It will be installed system/lib(64)/vndk-sp as a vendor variant.

Bug: 63866913
Test: build and boot with BOARD_VNDK_VERSION=current
Merged-In: Ie6cc6b99dcf985014a88a405c3ced7ce405a40be
Change-Id: Ie6cc6b99dcf985014a88a405c3ced7ce405a40be
(cherry picked from commit 420e2eedb26129be80c4d7805ec9ad851547bc81)
ndroid.bp
b0e9f4b67277c29511cb8cfeaadda58ff978953e 06-Sep-2017 Yifan Hong <elsk@google.com> Merge "Wrap liblog dependency in GOOGLE_PROTOBUF_MIN_LOG_LEVEL" am: 5ba8681115 -s ours am: a06252e0e8 -s ours am: 0658f31343 -s ours
am: fb8c4efb23 -s ours

Change-Id: Ie224724f4512bf64add5f431147118f2668ae50b
fb8c4efb236e5bd40c49cf26b3c48a7e819dc016 06-Sep-2017 Yifan Hong <elsk@google.com> Merge "Wrap liblog dependency in GOOGLE_PROTOBUF_MIN_LOG_LEVEL" am: 5ba8681115 -s ours am: a06252e0e8 -s ours
am: 0658f31343 -s ours

Change-Id: I9614b5922889c797e5a25f1dc634943e2bd82b66
0658f313437e704689aced48ce7ff57056b8123b 06-Sep-2017 Yifan Hong <elsk@google.com> Merge "Wrap liblog dependency in GOOGLE_PROTOBUF_MIN_LOG_LEVEL" am: 5ba8681115 -s ours
am: a06252e0e8 -s ours

Change-Id: I6befc82eca9bb3ad90d2d7b9034daedff1f93d5b
a06252e0e8f50a01e827193150b54b7d152f2e22 06-Sep-2017 Yifan Hong <elsk@google.com> Merge "Wrap liblog dependency in GOOGLE_PROTOBUF_MIN_LOG_LEVEL"
am: 5ba8681115 -s ours

Change-Id: I11f4a5920bf7164974205974bf0e14f737a8626c
5ba8681115ef922cb944d6fd804d782486a699a1 06-Sep-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Wrap liblog dependency in GOOGLE_PROTOBUF_MIN_LOG_LEVEL"
72301b73b4463b32b69e43af0cc2dde9ac89fb97 10-Jun-2017 Yifan Hong <elsk@google.com> Wrap liblog dependency in GOOGLE_PROTOBUF_MIN_LOG_LEVEL

__android_log_write is only used when GOOGLE_PROTOBUF_MIN_LOG_LEVEL
is defined. There is no dependency to android/log.h if
GOOGLE_PROTOBUF_MIN_LOG_LEVEL is not defined.

Test: mma -j
Test: m -j
Test: BOARD_VNDK_VERSION=current mma -j
Test: BOARD_VNDK_VERSION=current m -j

Bug: 37342627
Change-Id: I7ef73972ea925d0a29c1f84ac880ca834b3989db
Merged-In: I7ef73972ea925d0a29c1f84ac880ca834b3989db
rc/google/protobuf/stubs/common.cc
c12aff05a04f0befb401c4a9abe7725dd9d8aaa4 03-Sep-2017 android-build-team Robot <android-build-team-robot@google.com> release-request-b4448e78-a682-4bc1-b691-b70e74fef19f-for-git_pi-release-4314474 snap-temp-L95500000099150132

Change-Id: Ia23e59bbc78316d5e8537af4bc38ae3679900057
66f60adbcd3f133d759f47ba8fd395b6e5f50973 31-Aug-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Improve libprotoc support for plugins"
65f0291563dcee8da53df02f974a564ab6a4ebf6 28-Aug-2017 android-build-team Robot <android-build-team-robot@google.com> release-request-2c5efa61-1f02-4e74-bfeb-1ca3cd5028bd-for-git_pi-release-4301718 snap-temp-L56500000097146696

Change-Id: I0379130774f8af42db9075e6594cfef3ca35794d
ba7e2303ae0b1190c9bfe53b22c0811193999ecf 25-Aug-2017 George Burgess IV <gbiv@google.com> Merge "protobuf: work around a static analyzer bug" am: a518d2ff2d am: 3dabdaa679 am: 486b0c7624
am: 1434075c03

Change-Id: Ia0cbf68e49f0978a27d28786d46ed378a960bdee
1434075c03cfe2d174807633b6cd9b0a87ad358d 25-Aug-2017 George Burgess IV <gbiv@google.com> Merge "protobuf: work around a static analyzer bug" am: a518d2ff2d am: 3dabdaa679
am: 486b0c7624

Change-Id: I5cabf0c032d29f6a578ad921b34b57db30c715d0
486b0c762464809b4f441fa5d9822d8f0ecb1862 25-Aug-2017 George Burgess IV <gbiv@google.com> Merge "protobuf: work around a static analyzer bug" am: a518d2ff2d
am: 3dabdaa679

Change-Id: I309322fdbc2fae428fe49565f4e79e086bc7815a
3dabdaa6793e82ba78845222ebb94681df06ce7c 25-Aug-2017 George Burgess IV <gbiv@google.com> Merge "protobuf: work around a static analyzer bug"
am: a518d2ff2d

Change-Id: I3c63e05be132ec2baa1202c8b239a3eec29a1e9c
a518d2ff2dd91bb87a17d6fda7235a30b6fb064c 25-Aug-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "protobuf: work around a static analyzer bug"
95dea5c42f563f1fb60ca81eb837294324e6029f 22-Aug-2017 George Burgess IV <gbiv@google.com> protobuf: work around a static analyzer bug

The static analyzer is too aggressive about warning about memory leaks
when bit ops are involved: https://bugs.llvm.org/show_bug.cgi?id=34198

Adapted from upstream commit 98a3734b5aa680f565af10a5fd4430baa4b4aa10
(https://github.com/google/protobuf/pull/3503).

Bug: 27101951
Test: Ran static analyzer with this patch. Number of reds from .pb.*
files dropped significantly.
Change-Id: I68c119f4407c9f595518873511648ebe02fd9323
rc/google/protobuf/metadata.h
4128887c8aad3c68f7a79059b07659f90b5f2f9e 14-Aug-2017 Andrew Scull <ascull@google.com> Improve libprotoc support for plugins

The protobuf documentation says "plugins written in C++ should probably
build on the API in plugin.h" which offers PluginMain to call a
CodeGenerator.

Test: Build a protobuf plugin using PluginMain from libprotoc
Change-Id: Ie08b4f3fccc8344afb67827a786ef7460d7acc62
ndroid.bp
010c0d663b4ed7c0a84cfc6139c683fe2e1ec48f 13-Aug-2017 android-build-team Robot <android-build-team-robot@google.com> release-request-631994b2-37c0-4d03-8caa-bfd01530db29-for-git_pi-release-4269836 snap-temp-L23500000092503827

Change-Id: Ie7ba2f14907d11642731f7b6f0202a6a4105f598
a8e1624935b6fc7ddae59d6795c99030685e9254 11-Aug-2017 Justin Yun <justinyun@google.com> Mark the module as VNDK or VNDK-SP in Android.bp am: 420e2eedb2
am: 6d463899f8

Change-Id: I73f1b5fe880627e90daaf61189db1c9fc8ea3ae2
6d463899f83e5daa69cc4ba723877dbb02c5b10e 11-Aug-2017 Justin Yun <justinyun@google.com> Mark the module as VNDK or VNDK-SP in Android.bp
am: 420e2eedb2

Change-Id: Ia5a1975ef1b2927d51c8047201f6ca0939fe2514
420e2eedb26129be80c4d7805ec9ad851547bc81 24-Jul-2017 Justin Yun <justinyun@google.com> Mark the module as VNDK or VNDK-SP in Android.bp

As a VNDK/VNDK-SP module, Android.bp must have 'vndk' tag as well
as 'vendor_available: true'.

For a VNDK module, the 'vndk' tag has 'enabled: true'.
It will be installed system/lib(64)/vndk as a vendor variant.

For a VNDK-SP module, the 'vndk' tag has
'support_system_process: true' as well as 'enabled: true'.
It will be installed system/lib(64)/vndk-sp as a vendor variant.

Bug: 63866913
Test: build and boot with BOARD_VNDK_VERSION=current
Change-Id: Ie6cc6b99dcf985014a88a405c3ced7ce405a40be
ndroid.bp
48c2250fee8f79bcd080f0a68fa8458aa61683f2 27-Jun-2017 Tom Anderson <thomasanderson@chromium.org> Merge "Remove tr1 from unordered{set,map} configs" am: 7fca48d8ce am: 79a4c22ef3 am: d00c908a68
am: 17e0e5208d

Change-Id: I268137d5d75654a3f08ec5789cfbc1e94844ef3a
17e0e5208d367fcbfc2b93ec70d1abe20d779e60 27-Jun-2017 Tom Anderson <thomasanderson@chromium.org> Merge "Remove tr1 from unordered{set,map} configs" am: 7fca48d8ce am: 79a4c22ef3
am: d00c908a68

Change-Id: I49979f6954003b796056414e76490ed15f671c66
d00c908a68645f83f8cf8d4bcc715387697f208c 27-Jun-2017 Tom Anderson <thomasanderson@chromium.org> Merge "Remove tr1 from unordered{set,map} configs" am: 7fca48d8ce
am: 79a4c22ef3

Change-Id: I60abbe96e801537257ef46bd54a26009fac335db
79a4c22ef30794da906732f946b58778d92e93df 26-Jun-2017 Tom Anderson <thomasanderson@chromium.org> Merge "Remove tr1 from unordered{set,map} configs"
am: 7fca48d8ce

Change-Id: I4f4610fe6b10aca5b33c51b8fcadf9b9089e2ad5
7fca48d8ce97f7ba3ab8eea5c472f1ad3711762f 26-Jun-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Remove tr1 from unordered{set,map} configs"
c51e25aa1b54f02446e5862a149e33565f8397c1 22-Jun-2017 Tom Anderson <thomasanderson@chromium.org> Remove tr1 from unordered{set,map} configs

BUG=chromium:593874
R=nyquist@chromium.org

Change-Id: Iea253c0ca69877183abc9610aabdf139da0d28df
ndroid/config.h
d29ccdec2b2e08f745668bb6eb9abb367782a6be 12-Jun-2017 Yifan Hong <elsk@google.com> Wrap liblog dependency in GOOGLE_PROTOBUF_MIN_LOG_LEVEL am: 08ddffbd97
am: 88dcf194a1

Change-Id: I7c13db73236b808fc35613e9787caad4b7a9cdf4
88dcf194a1573d2b8f942b284cf82d0d4f1a7c34 12-Jun-2017 Yifan Hong <elsk@google.com> Wrap liblog dependency in GOOGLE_PROTOBUF_MIN_LOG_LEVEL
am: 08ddffbd97

Change-Id: I052386b5fdd2500903227de8a60a6721d4a78b13
08ddffbd976f97a994d70d909f933dff95569e6f 10-Jun-2017 Yifan Hong <elsk@google.com> Wrap liblog dependency in GOOGLE_PROTOBUF_MIN_LOG_LEVEL

__android_log_write is only used when GOOGLE_PROTOBUF_MIN_LOG_LEVEL
is defined. There is no dependency to android/log.h if
GOOGLE_PROTOBUF_MIN_LOG_LEVEL is not defined.

Test: mma -j
Test: m -j
Test: BOARD_VNDK_VERSION=current mma -j
Test: BOARD_VNDK_VERSION=current m -j

Bug: 37342627
Change-Id: I7ef73972ea925d0a29c1f84ac880ca834b3989db
rc/google/protobuf/stubs/common.cc
1ee0c0718b5cfeea7b5bf035c0c5405bbdb9fb88 07-Feb-2017 Joe Onorato <joeo@google.com> Generate syntactically correct java for imports from classes with no packages.

Even with this change, the code may not compile because it
is not possible to import a packageless class from a java
file with a package.

Test: make
Change-Id: I1422ead592314b72a5f9fd26663546873271a4b4
rc/google/protobuf/compiler/java/java_shared_code_generator.cc
03d979bc7c14bd9ceb817ca45cd1ee7f4a6cb5cc 21-Apr-2017 Jiyong Park <jiyong@google.com> Merge "mark libprotobuf-cpp-* as VNDK" am: 06884d010c am: 7f33a820b3 am: 41cc8ffd14
am: cd7f970a1f

Change-Id: I321ce2c3423c68a06f886eda67206a48b2a0f287
cd7f970a1fc1cbdab11103448a83c9877b18c080 21-Apr-2017 Jiyong Park <jiyong@google.com> Merge "mark libprotobuf-cpp-* as VNDK" am: 06884d010c am: 7f33a820b3
am: 41cc8ffd14

Change-Id: I9c77fc2660d153518dee7e056b022726ebf4defb
41cc8ffd14585bd0d7b6ad7c6782a51767dea7be 21-Apr-2017 Jiyong Park <jiyong@google.com> Merge "mark libprotobuf-cpp-* as VNDK" am: 06884d010c
am: 7f33a820b3

Change-Id: I4db7bfe853679efe9b0393ee9a6730d9411bac9f
7f33a820b314b6254925d327d6aede8d4bd60e0b 21-Apr-2017 Jiyong Park <jiyong@google.com> Merge "mark libprotobuf-cpp-* as VNDK"
am: 06884d010c

Change-Id: I46d76a99f570cf94d653f7e4b570363443613f58
06884d010cc3abbd97861e696cae2c1736679168 21-Apr-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "mark libprotobuf-cpp-* as VNDK"
0043f66c2fc9697a359a80dc63543f76955cdb3f 18-Apr-2017 Jiyong Park <jiyong@google.com> mark libprotobuf-cpp-* as VNDK

libprotobuf-cpp-*.so are now available to modules installed to vendor
partition.

Test: normal build successfull
Test: add vendor_available:true to any module using protobuf and build
with BOARD_VNDK_VERSION=current. Build is successful.

Change-Id: Id96dede15c2c236026e1db44e0dc628654485e62
ndroid.bp
4566a1da7dd83ad573f1778068b0b432ec0e9afc 01-Mar-2017 Aurimas Liutikas <aurimas@google.com> resolve merge conflicts of 4bb8a91 to master

Change-Id: I0611d987875444dd5debfe53a423ef4f069a2241
4bb8a91952f859be74b8938d821aabfd0a0f6e20 01-Mar-2017 Aurimas Liutikas <aurimas@google.com> Merge "Pull in two patches from protobuf upstream to suppress warnings" am: f1376b3a24
am: 0536f43ba6

Change-Id: Ifcf30d8a436e82e213936379eb27fcc72f35e95f
0536f43ba6b04df7c54a11820b206b6c91080e7e 28-Feb-2017 Aurimas Liutikas <aurimas@google.com> Merge "Pull in two patches from protobuf upstream to suppress warnings"
am: f1376b3a24

Change-Id: Ic78a2791dc1d88600047382b2b2be8a264da0ec4
f1376b3a24f1efff8bd9e0eda97d54800e090475 28-Feb-2017 Aurimas Liutikas <aurimas@google.com> Merge "Pull in two patches from protobuf upstream to suppress warnings"
c0074f6e81857c5471bfc5ea0f847e74b236af1c 28-Feb-2017 Aurimas Liutikas <aurimas@google.com> Pull in two patches from protobuf upstream to suppress warnings

This patch pull in two commits from upsteam of protobuf to suppress unused paramater
warnings need in android builds.
https://github.com/google/protobuf/commit/9079079ec0dac15700400a8c86b12595e9524901
https://github.com/google/protobuf/commit/a434bfc232de09de7d3ebc963290c960462212cb

Test: None
Change-Id: Ib399a495b7462b47cc7bd8f838bcaf31b70e66b5
rc/google/protobuf/generated_message_reflection.h
rc/google/protobuf/wire_format.h
6fd8f88ff5927e48a5836d451b7620855d19b4d9 21-Feb-2017 Jeff Davidson <jpd@google.com> Merge "Don't execute code before checking a class is a messagenano." am: 89ebbfb9a9 am: 72070e4cf3
am: 9764ba41a7

Change-Id: Ib26e94738b13fa5040f299117eed839f5a1ef4f5
9764ba41a78d953f6a74dc7b352cb7cade8edf73 21-Feb-2017 Jeff Davidson <jpd@google.com> Merge "Don't execute code before checking a class is a messagenano." am: 89ebbfb9a9
am: 72070e4cf3

Change-Id: I9a963a3dab44bcdcc23be6b2f67f9f2e2004a4d9
72070e4cf3caef4b4902cddcf823c88b984da7a2 21-Feb-2017 Jeff Davidson <jpd@google.com> Merge "Don't execute code before checking a class is a messagenano."
am: 89ebbfb9a9

Change-Id: Icb22d596bb6925a58e74e50ac445610f5ec09bb9
89ebbfb9a9383239ea7a4824aabf966b896b66cf 21-Feb-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Don't execute code before checking a class is a messagenano."
ce575973d003ce07fe7bba94378c96ed9b53c61a 16-Feb-2017 Jeff Davidson <jpd@google.com> Don't execute code before checking a class is a messagenano.

Test: Verified in internal tree
Change-Id: Icd57797f43e04827dca7c6765309413204adb99a
ava/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNanoCreator.java
d6e85cc78270fa821b694f6700c48bfc774a4b48 16-Feb-2017 Jeff Davidson <jpd@google.com> Don't execute code before checking a class is a messagenano.

Change-Id: Icd57797f43e04827dca7c6765309413204adb99a
avanano/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNanoCreator.java
401a0f1dae59162ca24c5b7fa295b29b28a9985d 27-Jan-2017 Mark Urbanus <urbanus@google.com> Use GOOGLE_CHECK Macro for validation

We were pulling in some foreign definitions of CHECK that were breaking
the build. Use GOOGLE_CHECK instead.

Bug: None
Test: Validated compilation
Change-Id: I597e5d7d820d8fb2649f51d6e9ec6b89f33a5b58
rc/google/protobuf/stubs/map_util.h
rc/google/protobuf/stubs/shared_ptr.h
50da2431bf838619bac86838b07d6125e1e00601 27-Jan-2017 Mark Urbanus <urbanus@google.com> Introduce a libprotobuf-cpp-lite_static for the host

We have several host-apps that depend on a static version of libprotobuf-cpp.

Bug: None
Test: Validated compilation
Change-Id: I232b654066833642eb8e72409b9554d2998e66d3
ndroid.bp
164759418725c987316559ed3f9977b2c8b6a1b2 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> DO NOT MERGE: Revert "Merge remote-tracking branch 'goog/protobuf3' into 'goog/master'" am: 29b3843f50
am: 4b805c37b3 -s ours

Change-Id: Idd9569d032ad6795b6ca4e2e4294dfc42d2061ce
8098d5ce8d4945ad6c9dbe4845fe35323f4c415d 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> DO NOT MERGE: Revert "Fix the Gradle build file after the proto3 update" am: 43aef89b6a
am: 2d8cc46f2d -s ours

Change-Id: I2b7be521c877be305755ab198558f62654ce2889
236a91d9ebe09804f31b6bf6f51cc4a679e6ac82 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> DO NOT MERGE: Revert "Add a flag to use offset/length with byte arrays." am: fbbea2898e
am: 3869c8bb50 -s ours

Change-Id: I8b676ab1b133c2f9f2c71a4e47deaab6bc083d09
3df49e6164a9a2495c0b7bc2a64b3048b317e9e8 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> DO NOT MERGE: Revert "Parse unknown enum values like full proto2." am: 6f1886b818
am: 244effd013 -s ours

Change-Id: I8e03663a303eb1023ff9e6602bdfcf8dc650fb8b
4b805c37b301ca48d2a81029280f6115ff180138 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> DO NOT MERGE: Revert "Merge remote-tracking branch 'goog/protobuf3' into 'goog/master'"
am: 29b3843f50

Change-Id: I3731ab47a320d00d81d15f222d3053d7603b6fee
2d8cc46f2d7f89716d47946ced619192ac693d09 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> DO NOT MERGE: Revert "Fix the Gradle build file after the proto3 update"
am: 43aef89b6a

Change-Id: I6c67fc6a3075250e273f7eefd244bf413aed8a64
3869c8bb50d70d51e04a10a8a46a2e911dbc2cf9 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> DO NOT MERGE: Revert "Add a flag to use offset/length with byte arrays."
am: fbbea2898e

Change-Id: I32dddbb8d828297c57cdc2ec8277ae14701af917
244effd0132e99dd25614fd2d6297360e6df2cd0 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> DO NOT MERGE: Revert "Parse unknown enum values like full proto2."
am: 6f1886b818

Change-Id: I47c9d57ed764f666926312228a51aea86ff0ab8e
c85724cbfe91fc1c2574bc094931716673959983 18-Jan-2017 Jeff Davidson <jpd@google.com> Parse unknown enum values like full proto2. am: 3686bacb71
am: 01badb543d

Change-Id: Ic04ccddad318d3344dbda0c94fb5b8b1524a444f
54c99020d8f4c1e685901467d87aecc16c541d0b 18-Jan-2017 Jeff Davidson <jpd@google.com> Add a flag to use offset/length with byte arrays. am: 4d68239ebc
am: dbe8383ccc -s ours

Change-Id: Iaef4210e3d46615c4d03baec3577bea502a5fc6f
bd7ca7a147198c378ba371ebff2c498477dcb752 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> Fix the Gradle build file after the proto3 update am: 91f7e3d893
am: ebd9efcb76

Change-Id: Ib030f27a734705917265e140bf048592284acf0a
75fc278b6d4ae098d647df345ee365d3e858c666 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> Merge remote-tracking branch 'goog/protobuf3' into 'goog/master' am: f1ee8f0477
am: 1d13423f21 -s ours

Change-Id: I4f669e5f6572f7246cfb689ee44ac6e6e42035ae
29b3843f50cf37615e6a94bc55119c2822c63fac 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> DO NOT MERGE: Revert "Merge remote-tracking branch 'goog/protobuf3' into 'goog/master'"

This reverts commit f1ee8f047793dc05a7f827410b9cdd4447842380.

Change-Id: Ic9caafabe69759d7031ce1236e1a0416bd57ca1d
gitignore
ndroid.bp
ndroid.mk
UILD
HANGES.txt
ONTRIBUTORS.txt
ICENSE
akefile.am
akefile.in
rotobuf.podspec
EADME.md
ORKSPACE
ppveyor.bat
ppveyor.yml
utogen.sh
enchmarks/Makefile.am
enchmarks/README.md
enchmarks/benchmark_messages_proto2.proto
enchmarks/benchmark_messages_proto3.proto
enchmarks/benchmarks.proto
enchmarks/generate_datasets.cc
enchmarks/google_size.proto
enchmarks/google_speed.proto
uild.gradle
make/CMakeLists.txt
make/README.md
make/extract_includes.bat.in
make/install.cmake
make/libprotobuf-lite.cmake
make/libprotobuf.cmake
make/libprotoc.cmake
make/protobuf-config-version.cmake.in
make/protobuf-config.cmake.in
make/protobuf-module.cmake.in
make/protoc.cmake
make/tests.cmake
onfigure.ac
onformance/ConformanceJava.java
onformance/ConformanceJavaLite.java
onformance/Makefile.am
onformance/README.md
onformance/conformance.proto
onformance/conformance_cpp.cc
onformance/conformance_objc.m
onformance/conformance_python.py
onformance/conformance_ruby.rb
onformance/conformance_test.cc
onformance/conformance_test.h
onformance/conformance_test_runner.cc
onformance/failure_list_cpp.txt
onformance/failure_list_csharp.txt
onformance/failure_list_java.txt
onformance/failure_list_objc.txt
onformance/failure_list_python-post26.txt
onformance/failure_list_python.txt
onformance/failure_list_python_cpp.txt
onformance/failure_list_ruby.txt
onformance/third_party/jsoncpp/json.h
onformance/third_party/jsoncpp/jsoncpp.cpp
sharp/.gitignore
sharp/CHANGES.txt
sharp/Google.Protobuf.Tools.nuspec
sharp/README.md
sharp/build_packages.bat
sharp/buildall.sh
sharp/generate_protos.sh
sharp/keys/Google.Protobuf.public.snk
sharp/keys/Google.Protobuf.snk
sharp/keys/README.md
sharp/protos/unittest_issues.proto
sharp/src/AddressBook/AddPerson.cs
sharp/src/AddressBook/AddressBook.csproj
sharp/src/AddressBook/Addressbook.cs
sharp/src/AddressBook/ListPeople.cs
sharp/src/AddressBook/Program.cs
sharp/src/AddressBook/Properties/AssemblyInfo.cs
sharp/src/AddressBook/SampleUsage.cs
sharp/src/AddressBook/app.config
sharp/src/Google.Protobuf.Conformance/App.config
sharp/src/Google.Protobuf.Conformance/Conformance.cs
sharp/src/Google.Protobuf.Conformance/Google.Protobuf.Conformance.csproj
sharp/src/Google.Protobuf.Conformance/Program.cs
sharp/src/Google.Protobuf.Conformance/Properties/AssemblyInfo.cs
sharp/src/Google.Protobuf.JsonDump/Google.Protobuf.JsonDump.csproj
sharp/src/Google.Protobuf.JsonDump/Program.cs
sharp/src/Google.Protobuf.JsonDump/Properties/AssemblyInfo.cs
sharp/src/Google.Protobuf.JsonDump/app.config
sharp/src/Google.Protobuf.Test/ByteStringTest.cs
sharp/src/Google.Protobuf.Test/CodedInputStreamExtensions.cs
sharp/src/Google.Protobuf.Test/CodedInputStreamTest.cs
sharp/src/Google.Protobuf.Test/CodedOutputStreamTest.cs
sharp/src/Google.Protobuf.Test/Collections/MapFieldTest.cs
sharp/src/Google.Protobuf.Test/Collections/RepeatedFieldTest.cs
sharp/src/Google.Protobuf.Test/Compatibility/PropertyInfoExtensionsTest.cs
sharp/src/Google.Protobuf.Test/Compatibility/TypeExtensionsTest.cs
sharp/src/Google.Protobuf.Test/DeprecatedMemberTest.cs
sharp/src/Google.Protobuf.Test/EqualityTester.cs
sharp/src/Google.Protobuf.Test/FieldCodecTest.cs
sharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs
sharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj
sharp/src/Google.Protobuf.Test/IssuesTest.cs
sharp/src/Google.Protobuf.Test/JsonFormatterTest.cs
sharp/src/Google.Protobuf.Test/JsonParserTest.cs
sharp/src/Google.Protobuf.Test/JsonTokenizerTest.cs
sharp/src/Google.Protobuf.Test/Properties/AppManifest.xml
sharp/src/Google.Protobuf.Test/Properties/AssemblyInfo.cs
sharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs
sharp/src/Google.Protobuf.Test/Reflection/FieldAccessTest.cs
sharp/src/Google.Protobuf.Test/Reflection/TypeRegistryTest.cs
sharp/src/Google.Protobuf.Test/SampleEnum.cs
sharp/src/Google.Protobuf.Test/SampleMessages.cs
sharp/src/Google.Protobuf.Test/TestCornerCases.cs
sharp/src/Google.Protobuf.Test/TestProtos/ForeignMessagePartial.cs
sharp/src/Google.Protobuf.Test/TestProtos/MapUnittestProto3.cs
sharp/src/Google.Protobuf.Test/TestProtos/UnittestImportProto3.cs
sharp/src/Google.Protobuf.Test/TestProtos/UnittestImportPublicProto3.cs
sharp/src/Google.Protobuf.Test/TestProtos/UnittestIssues.cs
sharp/src/Google.Protobuf.Test/TestProtos/UnittestProto3.cs
sharp/src/Google.Protobuf.Test/TestProtos/UnittestWellKnownTypes.cs
sharp/src/Google.Protobuf.Test/WellKnownTypes/AnyTest.cs
sharp/src/Google.Protobuf.Test/WellKnownTypes/DurationTest.cs
sharp/src/Google.Protobuf.Test/WellKnownTypes/FieldMaskTest.cs
sharp/src/Google.Protobuf.Test/WellKnownTypes/TimestampTest.cs
sharp/src/Google.Protobuf.Test/WellKnownTypes/WrappersTest.cs
sharp/src/Google.Protobuf.Test/packages.config
sharp/src/Google.Protobuf.sln
sharp/src/Google.Protobuf/ByteArray.cs
sharp/src/Google.Protobuf/ByteString.cs
sharp/src/Google.Protobuf/CodedInputStream.cs
sharp/src/Google.Protobuf/CodedOutputStream.ComputeSize.cs
sharp/src/Google.Protobuf/CodedOutputStream.cs
sharp/src/Google.Protobuf/Collections/MapField.cs
sharp/src/Google.Protobuf/Collections/ReadOnlyDictionary.cs
sharp/src/Google.Protobuf/Collections/RepeatedField.cs
sharp/src/Google.Protobuf/Compatibility/PropertyInfoExtensions.cs
sharp/src/Google.Protobuf/Compatibility/TypeExtensions.cs
sharp/src/Google.Protobuf/FieldCodec.cs
sharp/src/Google.Protobuf/FrameworkPortability.cs
sharp/src/Google.Protobuf/Google.Protobuf.csproj
sharp/src/Google.Protobuf/Google.Protobuf.nuspec
sharp/src/Google.Protobuf/ICustomDiagnosticMessage.cs
sharp/src/Google.Protobuf/IDeepCloneable.cs
sharp/src/Google.Protobuf/IMessage.cs
sharp/src/Google.Protobuf/InvalidJsonException.cs
sharp/src/Google.Protobuf/InvalidProtocolBufferException.cs
sharp/src/Google.Protobuf/JsonFormatter.cs
sharp/src/Google.Protobuf/JsonParser.cs
sharp/src/Google.Protobuf/JsonToken.cs
sharp/src/Google.Protobuf/JsonTokenizer.cs
sharp/src/Google.Protobuf/LimitedInputStream.cs
sharp/src/Google.Protobuf/MessageExtensions.cs
sharp/src/Google.Protobuf/MessageParser.cs
sharp/src/Google.Protobuf/Properties/AssemblyInfo.cs
sharp/src/Google.Protobuf/ProtoPreconditions.cs
sharp/src/Google.Protobuf/Reflection/Descriptor.cs
sharp/src/Google.Protobuf/Reflection/DescriptorBase.cs
sharp/src/Google.Protobuf/Reflection/DescriptorPool.cs
sharp/src/Google.Protobuf/Reflection/DescriptorUtil.cs
sharp/src/Google.Protobuf/Reflection/DescriptorValidationException.cs
sharp/src/Google.Protobuf/Reflection/EnumDescriptor.cs
sharp/src/Google.Protobuf/Reflection/EnumValueDescriptor.cs
sharp/src/Google.Protobuf/Reflection/FieldAccessorBase.cs
sharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs
sharp/src/Google.Protobuf/Reflection/FieldType.cs
sharp/src/Google.Protobuf/Reflection/FileDescriptor.cs
sharp/src/Google.Protobuf/Reflection/GeneratedClrTypeInfo.cs
sharp/src/Google.Protobuf/Reflection/IDescriptor.cs
sharp/src/Google.Protobuf/Reflection/IFieldAccessor.cs
sharp/src/Google.Protobuf/Reflection/MapFieldAccessor.cs
sharp/src/Google.Protobuf/Reflection/MessageDescriptor.cs
sharp/src/Google.Protobuf/Reflection/MethodDescriptor.cs
sharp/src/Google.Protobuf/Reflection/OneofAccessor.cs
sharp/src/Google.Protobuf/Reflection/OneofDescriptor.cs
sharp/src/Google.Protobuf/Reflection/OriginalNameAttribute.cs
sharp/src/Google.Protobuf/Reflection/PackageDescriptor.cs
sharp/src/Google.Protobuf/Reflection/PartialClasses.cs
sharp/src/Google.Protobuf/Reflection/ReflectionUtil.cs
sharp/src/Google.Protobuf/Reflection/RepeatedFieldAccessor.cs
sharp/src/Google.Protobuf/Reflection/ServiceDescriptor.cs
sharp/src/Google.Protobuf/Reflection/SingleFieldAccessor.cs
sharp/src/Google.Protobuf/Reflection/TypeRegistry.cs
sharp/src/Google.Protobuf/WellKnownTypes/Any.cs
sharp/src/Google.Protobuf/WellKnownTypes/AnyPartial.cs
sharp/src/Google.Protobuf/WellKnownTypes/Api.cs
sharp/src/Google.Protobuf/WellKnownTypes/Duration.cs
sharp/src/Google.Protobuf/WellKnownTypes/DurationPartial.cs
sharp/src/Google.Protobuf/WellKnownTypes/Empty.cs
sharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs
sharp/src/Google.Protobuf/WellKnownTypes/FieldMaskPartial.cs
sharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs
sharp/src/Google.Protobuf/WellKnownTypes/Struct.cs
sharp/src/Google.Protobuf/WellKnownTypes/TimeExtensions.cs
sharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs
sharp/src/Google.Protobuf/WellKnownTypes/TimestampPartial.cs
sharp/src/Google.Protobuf/WellKnownTypes/Type.cs
sharp/src/Google.Protobuf/WellKnownTypes/ValuePartial.cs
sharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs
sharp/src/Google.Protobuf/WellKnownTypes/WrappersPartial.cs
sharp/src/Google.Protobuf/WireFormat.cs
sharp/src/Google.Protobuf/packages.config
sharp/src/packages/repositories.config
ocs/swift/DesignDoc.md
ocs/third_party.md
ditors/proto.vim
ditors/protobuf-mode.el
xamples/AddPerson.java
xamples/ListPeople.java
xamples/Makefile
xamples/README.txt
xamples/add_person.cc
xamples/add_person.go
xamples/add_person.py
xamples/add_person_test.go
xamples/addressbook.proto
xamples/list_people.cc
xamples/list_people.go
xamples/list_people.py
xamples/list_people_test.go
enerate_descriptor_proto.sh
mock.BUILD
ava/README.md
ava/README.txt
ava/core/generate-sources-build.xml
ava/core/generate-test-sources-build.xml
ava/core/pom.xml
ava/core/src/main/java/com/google/protobuf/AbstractMessage.java
ava/core/src/main/java/com/google/protobuf/AbstractMessageLite.java
ava/core/src/main/java/com/google/protobuf/AbstractParser.java
ava/core/src/main/java/com/google/protobuf/AbstractProtobufList.java
ava/core/src/main/java/com/google/protobuf/BlockingRpcChannel.java
ava/core/src/main/java/com/google/protobuf/BlockingService.java
ava/core/src/main/java/com/google/protobuf/BooleanArrayList.java
ava/core/src/main/java/com/google/protobuf/ByteBufferWriter.java
ava/core/src/main/java/com/google/protobuf/ByteOutput.java
ava/core/src/main/java/com/google/protobuf/ByteString.java
ava/core/src/main/java/com/google/protobuf/CodedInputStream.java
ava/core/src/main/java/com/google/protobuf/CodedOutputStream.java
ava/core/src/main/java/com/google/protobuf/Descriptors.java
ava/core/src/main/java/com/google/protobuf/DoubleArrayList.java
ava/core/src/main/java/com/google/protobuf/DynamicMessage.java
ava/core/src/main/java/com/google/protobuf/ExperimentalApi.java
ava/core/src/main/java/com/google/protobuf/Extension.java
ava/core/src/main/java/com/google/protobuf/ExtensionLite.java
ava/core/src/main/java/com/google/protobuf/ExtensionRegistry.java
ava/core/src/main/java/com/google/protobuf/ExtensionRegistryLite.java
ava/core/src/main/java/com/google/protobuf/FieldSet.java
ava/core/src/main/java/com/google/protobuf/FloatArrayList.java
ava/core/src/main/java/com/google/protobuf/GeneratedMessage.java
ava/core/src/main/java/com/google/protobuf/GeneratedMessageLite.java
ava/core/src/main/java/com/google/protobuf/IntArrayList.java
ava/core/src/main/java/com/google/protobuf/Internal.java
ava/core/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java
ava/core/src/main/java/com/google/protobuf/LazyField.java
ava/core/src/main/java/com/google/protobuf/LazyFieldLite.java
ava/core/src/main/java/com/google/protobuf/LazyStringArrayList.java
ava/core/src/main/java/com/google/protobuf/LazyStringList.java
ava/core/src/main/java/com/google/protobuf/LongArrayList.java
ava/core/src/main/java/com/google/protobuf/MapEntry.java
ava/core/src/main/java/com/google/protobuf/MapEntryLite.java
ava/core/src/main/java/com/google/protobuf/MapField.java
ava/core/src/main/java/com/google/protobuf/MapFieldLite.java
ava/core/src/main/java/com/google/protobuf/Message.java
ava/core/src/main/java/com/google/protobuf/MessageLite.java
ava/core/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java
ava/core/src/main/java/com/google/protobuf/MessageLiteToString.java
ava/core/src/main/java/com/google/protobuf/MessageOrBuilder.java
ava/core/src/main/java/com/google/protobuf/MessageReflection.java
ava/core/src/main/java/com/google/protobuf/MutabilityOracle.java
ava/core/src/main/java/com/google/protobuf/NioByteString.java
ava/core/src/main/java/com/google/protobuf/Parser.java
ava/core/src/main/java/com/google/protobuf/ProtobufArrayList.java
ava/core/src/main/java/com/google/protobuf/ProtocolMessageEnum.java
ava/core/src/main/java/com/google/protobuf/ProtocolStringList.java
ava/core/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java
ava/core/src/main/java/com/google/protobuf/RopeByteString.java
ava/core/src/main/java/com/google/protobuf/RpcCallback.java
ava/core/src/main/java/com/google/protobuf/RpcChannel.java
ava/core/src/main/java/com/google/protobuf/RpcController.java
ava/core/src/main/java/com/google/protobuf/RpcUtil.java
ava/core/src/main/java/com/google/protobuf/Service.java
ava/core/src/main/java/com/google/protobuf/ServiceException.java
ava/core/src/main/java/com/google/protobuf/SingleFieldBuilder.java
ava/core/src/main/java/com/google/protobuf/SmallSortedMap.java
ava/core/src/main/java/com/google/protobuf/TextFormat.java
ava/core/src/main/java/com/google/protobuf/TextFormatEscaper.java
ava/core/src/main/java/com/google/protobuf/TextFormatParseInfoTree.java
ava/core/src/main/java/com/google/protobuf/TextFormatParseLocation.java
ava/core/src/main/java/com/google/protobuf/UninitializedMessageException.java
ava/core/src/main/java/com/google/protobuf/UnknownFieldSet.java
ava/core/src/main/java/com/google/protobuf/UnknownFieldSetLite.java
ava/core/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java
ava/core/src/main/java/com/google/protobuf/UnsafeByteOperations.java
ava/core/src/main/java/com/google/protobuf/Utf8.java
ava/core/src/main/java/com/google/protobuf/WireFormat.java
ava/core/src/test/java/com/google/protobuf/AbstractMessageTest.java
ava/core/src/test/java/com/google/protobuf/AnyTest.java
ava/core/src/test/java/com/google/protobuf/BooleanArrayListTest.java
ava/core/src/test/java/com/google/protobuf/BoundedByteStringTest.java
ava/core/src/test/java/com/google/protobuf/ByteBufferWriterTest.java
ava/core/src/test/java/com/google/protobuf/ByteStringTest.java
ava/core/src/test/java/com/google/protobuf/CheckUtf8Test.java
ava/core/src/test/java/com/google/protobuf/CodedInputStreamTest.java
ava/core/src/test/java/com/google/protobuf/CodedOutputStreamTest.java
ava/core/src/test/java/com/google/protobuf/DeprecatedFieldTest.java
ava/core/src/test/java/com/google/protobuf/DescriptorsTest.java
ava/core/src/test/java/com/google/protobuf/DoubleArrayListTest.java
ava/core/src/test/java/com/google/protobuf/DynamicMessageTest.java
ava/core/src/test/java/com/google/protobuf/EnumTest.java
ava/core/src/test/java/com/google/protobuf/FieldPresenceTest.java
ava/core/src/test/java/com/google/protobuf/FloatArrayListTest.java
ava/core/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java
ava/core/src/test/java/com/google/protobuf/GeneratedMessageTest.java
ava/core/src/test/java/com/google/protobuf/IntArrayListTest.java
ava/core/src/test/java/com/google/protobuf/IsValidUtf8Test.java
ava/core/src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java
ava/core/src/test/java/com/google/protobuf/LazyFieldLiteTest.java
ava/core/src/test/java/com/google/protobuf/LazyFieldTest.java
ava/core/src/test/java/com/google/protobuf/LazyMessageLiteTest.java
ava/core/src/test/java/com/google/protobuf/LazyStringArrayListTest.java
ava/core/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java
ava/core/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java
ava/core/src/test/java/com/google/protobuf/LiteTest.java
ava/core/src/test/java/com/google/protobuf/LiteralByteStringTest.java
ava/core/src/test/java/com/google/protobuf/LongArrayListTest.java
ava/core/src/test/java/com/google/protobuf/MapForProto2LiteTest.java
ava/core/src/test/java/com/google/protobuf/MapForProto2Test.java
ava/core/src/test/java/com/google/protobuf/MapTest.java
ava/core/src/test/java/com/google/protobuf/MessageTest.java
ava/core/src/test/java/com/google/protobuf/NestedBuildersTest.java
ava/core/src/test/java/com/google/protobuf/NioByteStringTest.java
ava/core/src/test/java/com/google/protobuf/ParseExceptionsTest.java
ava/core/src/test/java/com/google/protobuf/ParserTest.java
ava/core/src/test/java/com/google/protobuf/ProtobufArrayListTest.java
ava/core/src/test/java/com/google/protobuf/RepeatedFieldBuilderTest.java
ava/core/src/test/java/com/google/protobuf/RopeByteStringSubstringTest.java
ava/core/src/test/java/com/google/protobuf/RopeByteStringTest.java
ava/core/src/test/java/com/google/protobuf/ServiceTest.java
ava/core/src/test/java/com/google/protobuf/SingleFieldBuilderTest.java
ava/core/src/test/java/com/google/protobuf/SmallSortedMapTest.java
ava/core/src/test/java/com/google/protobuf/TestBadIdentifiers.java
ava/core/src/test/java/com/google/protobuf/TestUtil.java
ava/core/src/test/java/com/google/protobuf/TestUtilLite.java
ava/core/src/test/java/com/google/protobuf/TextFormatParseInfoTreeTest.java
ava/core/src/test/java/com/google/protobuf/TextFormatParseLocationTest.java
ava/core/src/test/java/com/google/protobuf/TextFormatTest.java
ava/core/src/test/java/com/google/protobuf/UnknownEnumValueTest.java
ava/core/src/test/java/com/google/protobuf/UnknownFieldSetLiteTest.java
ava/core/src/test/java/com/google/protobuf/UnknownFieldSetTest.java
ava/core/src/test/java/com/google/protobuf/UnmodifiableLazyStringListTest.java
ava/core/src/test/java/com/google/protobuf/WellKnownTypesTest.java
ava/core/src/test/java/com/google/protobuf/WireFormatTest.java
ava/core/src/test/proto/com/google/protobuf/any_test.proto
ava/core/src/test/proto/com/google/protobuf/field_presence_test.proto
ava/core/src/test/proto/com/google/protobuf/lazy_fields_lite.proto
ava/core/src/test/proto/com/google/protobuf/lite_equals_and_hash.proto
ava/core/src/test/proto/com/google/protobuf/map_for_proto2_lite_test.proto
ava/core/src/test/proto/com/google/protobuf/map_for_proto2_test.proto
ava/core/src/test/proto/com/google/protobuf/map_initialization_order_test.proto
ava/core/src/test/proto/com/google/protobuf/map_test.proto
ava/core/src/test/proto/com/google/protobuf/multiple_files_test.proto
ava/core/src/test/proto/com/google/protobuf/nested_builders_test.proto
ava/core/src/test/proto/com/google/protobuf/nested_extension.proto
ava/core/src/test/proto/com/google/protobuf/nested_extension_lite.proto
ava/core/src/test/proto/com/google/protobuf/non_nested_extension.proto
ava/core/src/test/proto/com/google/protobuf/non_nested_extension_lite.proto
ava/core/src/test/proto/com/google/protobuf/outer_class_name_test.proto
ava/core/src/test/proto/com/google/protobuf/outer_class_name_test2.proto
ava/core/src/test/proto/com/google/protobuf/outer_class_name_test3.proto
ava/core/src/test/proto/com/google/protobuf/test_bad_identifiers.proto
ava/core/src/test/proto/com/google/protobuf/test_check_utf8.proto
ava/core/src/test/proto/com/google/protobuf/test_check_utf8_size.proto
ava/core/src/test/proto/com/google/protobuf/test_custom_options.proto
ava/core/src/test/proto/com/google/protobuf/test_extra_interfaces.proto
ava/lite/generate-sources-build.xml
ava/lite/generate-test-sources-build.xml
ava/lite/pom.xml
ava/pom.xml
ava/src/device/main/java/com/google/protobuf/nano/android/ParcelableExtendableMessageNano.java
ava/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNano.java
ava/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNanoCreator.java
ava/src/device/test/AndroidManifest.xml
ava/src/device/test/java/com/google/protobuf/nano/NanoAndroidTest.java
ava/src/main/java/com/google/protobuf/AbstractMessage.java
ava/src/main/java/com/google/protobuf/AbstractMessageLite.java
ava/src/main/java/com/google/protobuf/AbstractParser.java
ava/src/main/java/com/google/protobuf/BlockingRpcChannel.java
ava/src/main/java/com/google/protobuf/BlockingService.java
ava/src/main/java/com/google/protobuf/BoundedByteString.java
ava/src/main/java/com/google/protobuf/ByteString.java
ava/src/main/java/com/google/protobuf/CodedInputStream.java
ava/src/main/java/com/google/protobuf/CodedOutputStream.java
ava/src/main/java/com/google/protobuf/Descriptors.java
ava/src/main/java/com/google/protobuf/DynamicMessage.java
ava/src/main/java/com/google/protobuf/Extension.java
ava/src/main/java/com/google/protobuf/ExtensionRegistry.java
ava/src/main/java/com/google/protobuf/ExtensionRegistryLite.java
ava/src/main/java/com/google/protobuf/FieldSet.java
ava/src/main/java/com/google/protobuf/GeneratedMessage.java
ava/src/main/java/com/google/protobuf/GeneratedMessageLite.java
ava/src/main/java/com/google/protobuf/Internal.java
ava/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java
ava/src/main/java/com/google/protobuf/LazyField.java
ava/src/main/java/com/google/protobuf/LazyFieldLite.java
ava/src/main/java/com/google/protobuf/LazyStringArrayList.java
ava/src/main/java/com/google/protobuf/LazyStringList.java
ava/src/main/java/com/google/protobuf/LiteralByteString.java
ava/src/main/java/com/google/protobuf/Message.java
ava/src/main/java/com/google/protobuf/MessageLite.java
ava/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java
ava/src/main/java/com/google/protobuf/MessageOrBuilder.java
ava/src/main/java/com/google/protobuf/MessageReflection.java
ava/src/main/java/com/google/protobuf/Parser.java
ava/src/main/java/com/google/protobuf/ProtocolMessageEnum.java
ava/src/main/java/com/google/protobuf/ProtocolStringList.java
ava/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java
ava/src/main/java/com/google/protobuf/RopeByteString.java
ava/src/main/java/com/google/protobuf/RpcCallback.java
ava/src/main/java/com/google/protobuf/RpcChannel.java
ava/src/main/java/com/google/protobuf/RpcController.java
ava/src/main/java/com/google/protobuf/RpcUtil.java
ava/src/main/java/com/google/protobuf/Service.java
ava/src/main/java/com/google/protobuf/ServiceException.java
ava/src/main/java/com/google/protobuf/SingleFieldBuilder.java
ava/src/main/java/com/google/protobuf/SmallSortedMap.java
ava/src/main/java/com/google/protobuf/TextFormat.java
ava/src/main/java/com/google/protobuf/UninitializedMessageException.java
ava/src/main/java/com/google/protobuf/UnknownFieldSet.java
ava/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java
ava/src/main/java/com/google/protobuf/Utf8.java
ava/src/main/java/com/google/protobuf/WireFormat.java
ava/src/main/java/com/google/protobuf/micro/ByteStringMicro.java
ava/src/main/java/com/google/protobuf/micro/CodedInputStreamMicro.java
ava/src/main/java/com/google/protobuf/micro/CodedOutputStreamMicro.java
ava/src/main/java/com/google/protobuf/micro/InvalidProtocolBufferMicroException.java
ava/src/main/java/com/google/protobuf/micro/MessageMicro.java
ava/src/main/java/com/google/protobuf/micro/WireFormatMicro.java
ava/src/main/java/com/google/protobuf/nano/CodedInputByteBufferNano.java
ava/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java
ava/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
ava/src/main/java/com/google/protobuf/nano/Extension.java
ava/src/main/java/com/google/protobuf/nano/FieldArray.java
ava/src/main/java/com/google/protobuf/nano/FieldData.java
ava/src/main/java/com/google/protobuf/nano/InternalNano.java
ava/src/main/java/com/google/protobuf/nano/InvalidProtocolBufferNanoException.java
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
ava/src/main/java/com/google/protobuf/nano/UnknownFieldData.java
ava/src/main/java/com/google/protobuf/nano/WireFormatNano.java
ava/src/test/java/com/google/protobuf/AbstractMessageTest.java
ava/src/test/java/com/google/protobuf/BoundedByteStringTest.java
ava/src/test/java/com/google/protobuf/ByteStringTest.java
ava/src/test/java/com/google/protobuf/CheckUtf8Test.java
ava/src/test/java/com/google/protobuf/CodedInputStreamTest.java
ava/src/test/java/com/google/protobuf/CodedOutputStreamTest.java
ava/src/test/java/com/google/protobuf/DeprecatedFieldTest.java
ava/src/test/java/com/google/protobuf/DescriptorsTest.java
ava/src/test/java/com/google/protobuf/DynamicMessageTest.java
ava/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java
ava/src/test/java/com/google/protobuf/GeneratedMessageTest.java
ava/src/test/java/com/google/protobuf/IsValidUtf8Test.java
ava/src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java
ava/src/test/java/com/google/protobuf/LazyFieldLiteTest.java
ava/src/test/java/com/google/protobuf/LazyFieldTest.java
ava/src/test/java/com/google/protobuf/LazyMessageLiteTest.java
ava/src/test/java/com/google/protobuf/LazyStringArrayListTest.java
ava/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java
ava/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java
ava/src/test/java/com/google/protobuf/LiteTest.java
ava/src/test/java/com/google/protobuf/LiteralByteStringTest.java
ava/src/test/java/com/google/protobuf/MessageTest.java
ava/src/test/java/com/google/protobuf/MicroTest.java
ava/src/test/java/com/google/protobuf/NanoTest.java
ava/src/test/java/com/google/protobuf/NestedBuildersTest.java
ava/src/test/java/com/google/protobuf/ParserTest.java
ava/src/test/java/com/google/protobuf/RepeatedFieldBuilderTest.java
ava/src/test/java/com/google/protobuf/RopeByteStringSubstringTest.java
ava/src/test/java/com/google/protobuf/RopeByteStringTest.java
ava/src/test/java/com/google/protobuf/ServiceTest.java
ava/src/test/java/com/google/protobuf/SingleFieldBuilderTest.java
ava/src/test/java/com/google/protobuf/SmallSortedMapTest.java
ava/src/test/java/com/google/protobuf/TestBadIdentifiers.java
ava/src/test/java/com/google/protobuf/TestUtil.java
ava/src/test/java/com/google/protobuf/TextFormatTest.java
ava/src/test/java/com/google/protobuf/UnknownFieldSetTest.java
ava/src/test/java/com/google/protobuf/UnmodifiableLazyStringListTest.java
ava/src/test/java/com/google/protobuf/WireFormatTest.java
ava/src/test/java/com/google/protobuf/lazy_fields_lite.proto
ava/src/test/java/com/google/protobuf/lite_equals_and_hash.proto
ava/src/test/java/com/google/protobuf/multiple_files_test.proto
ava/src/test/java/com/google/protobuf/nested_builders_test.proto
ava/src/test/java/com/google/protobuf/nested_extension.proto
ava/src/test/java/com/google/protobuf/nested_extension_lite.proto
ava/src/test/java/com/google/protobuf/non_nested_extension.proto
ava/src/test/java/com/google/protobuf/non_nested_extension_lite.proto
ava/src/test/java/com/google/protobuf/outer_class_name_test.proto
ava/src/test/java/com/google/protobuf/outer_class_name_test2.proto
ava/src/test/java/com/google/protobuf/outer_class_name_test3.proto
ava/src/test/java/com/google/protobuf/test_bad_identifiers.proto
ava/src/test/java/com/google/protobuf/test_check_utf8.proto
ava/src/test/java/com/google/protobuf/test_check_utf8_size.proto
ava/src/test/java/com/google/protobuf/test_custom_options.proto
ava/src/test/java/com/google/protobuf/test_extra_interfaces.proto
ava/util/pom.xml
ava/util/src/main/java/com/google/protobuf/util/FieldMaskTree.java
ava/util/src/main/java/com/google/protobuf/util/FieldMaskUtil.java
ava/util/src/main/java/com/google/protobuf/util/JsonFormat.java
ava/util/src/main/java/com/google/protobuf/util/TimeUtil.java
ava/util/src/test/java/com/google/protobuf/util/FieldMaskTreeTest.java
ava/util/src/test/java/com/google/protobuf/util/FieldMaskUtilTest.java
ava/util/src/test/java/com/google/protobuf/util/JsonFormatTest.java
ava/util/src/test/java/com/google/protobuf/util/TimeUtilTest.java
ava/util/src/test/proto/com/google/protobuf/util/json_test.proto
avamicro/src/main/java/com/google/protobuf/micro/ByteStringMicro.java
avamicro/src/main/java/com/google/protobuf/micro/CodedInputStreamMicro.java
avamicro/src/main/java/com/google/protobuf/micro/CodedOutputStreamMicro.java
avamicro/src/main/java/com/google/protobuf/micro/InvalidProtocolBufferMicroException.java
avamicro/src/main/java/com/google/protobuf/micro/MessageMicro.java
avamicro/src/main/java/com/google/protobuf/micro/WireFormatMicro.java
avanano/README.md
avanano/pom.xml
avanano/src/device/main/java/com/google/protobuf/nano/android/ParcelableExtendableMessageNano.java
avanano/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNano.java
avanano/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNanoCreator.java
avanano/src/device/test/AndroidManifest.xml
avanano/src/device/test/java/com/google/protobuf/nano/NanoAndroidTest.java
avanano/src/main/java/com/google/protobuf/nano/CodedInputByteBufferNano.java
avanano/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java
avanano/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
avanano/src/main/java/com/google/protobuf/nano/Extension.java
avanano/src/main/java/com/google/protobuf/nano/FieldArray.java
avanano/src/main/java/com/google/protobuf/nano/FieldData.java
avanano/src/main/java/com/google/protobuf/nano/InternalNano.java
avanano/src/main/java/com/google/protobuf/nano/InvalidProtocolBufferNanoException.java
avanano/src/main/java/com/google/protobuf/nano/MapFactories.java
avanano/src/main/java/com/google/protobuf/nano/MessageNano.java
avanano/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
avanano/src/main/java/com/google/protobuf/nano/UnknownFieldData.java
avanano/src/main/java/com/google/protobuf/nano/WireFormatNano.java
avanano/src/test/java/com/google/protobuf/nano/NanoTest.java
avanano/src/test/java/com/google/protobuf/nano/map_test.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_accessors_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_enum_class_multiple_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_enum_class_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_enum_validity_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_extension_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_extension_packed_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_extension_repeated_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_extension_singular_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_has_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_import_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nameclash_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_recursive_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_reference_types_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_repeated_merge_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_repeated_packables_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_simple_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_single_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_stringutf8_nano.proto
enkins/README.md
enkins/build_and_run_docker.sh
enkins/buildcmds/README.md
enkins/buildcmds/pull_request.sh
enkins/docker/Dockerfile
enkins/make_test_output.py
enkins/pull_request_in_docker.sh
s/README.md
s/binary/arith.js
s/binary/arith_test.js
s/binary/constants.js
s/binary/decoder.js
s/binary/decoder_test.js
s/binary/encoder.js
s/binary/proto_test.js
s/binary/reader.js
s/binary/reader_test.js
s/binary/utils.js
s/binary/utils_test.js
s/binary/writer.js
s/binary/writer_test.js
s/commonjs/export.js
s/commonjs/export_asserts.js
s/commonjs/export_testdeps.js
s/commonjs/import_test.js
s/commonjs/jasmine.json
s/commonjs/rewrite_tests_for_commonjs.js
s/commonjs/test6/test6.proto
s/commonjs/test7/test7.proto
s/data.proto
s/debug.js
s/debug_test.js
s/gulpfile.js
s/jasmine.json
s/message.js
s/message_test.js
s/node_loader.js
s/package.json
s/proto3_test.js
s/proto3_test.proto
s/test.proto
s/test2.proto
s/test3.proto
s/test4.proto
s/test5.proto
s/test_bootstrap.js
s/testbinary.proto
s/testempty.proto
4/acx_check_suncc.m4
4/libtool.m4
4/ltoptions.m4
4/ltsugar.m4
4/ltversion.m4
4/lt~obsolete.m4
4/stl_hash.m4
bjectivec/DevTools/check_version_stamps.sh
bjectivec/DevTools/compile_testing_protos.sh
bjectivec/DevTools/full_mac_build.sh
bjectivec/DevTools/pddm.py
bjectivec/DevTools/pddm_tests.py
bjectivec/GPBArray.h
bjectivec/GPBArray.m
bjectivec/GPBArray_PackagePrivate.h
bjectivec/GPBBootstrap.h
bjectivec/GPBCodedInputStream.h
bjectivec/GPBCodedInputStream.m
bjectivec/GPBCodedInputStream_PackagePrivate.h
bjectivec/GPBCodedOutputStream.h
bjectivec/GPBCodedOutputStream.m
bjectivec/GPBCodedOutputStream_PackagePrivate.h
bjectivec/GPBDescriptor.h
bjectivec/GPBDescriptor.m
bjectivec/GPBDescriptor_PackagePrivate.h
bjectivec/GPBDictionary.h
bjectivec/GPBDictionary.m
bjectivec/GPBDictionary_PackagePrivate.h
bjectivec/GPBExtensionInternals.h
bjectivec/GPBExtensionInternals.m
bjectivec/GPBExtensionRegistry.h
bjectivec/GPBExtensionRegistry.m
bjectivec/GPBMessage.h
bjectivec/GPBMessage.m
bjectivec/GPBMessage_PackagePrivate.h
bjectivec/GPBProtocolBuffers.h
bjectivec/GPBProtocolBuffers.m
bjectivec/GPBProtocolBuffers_RuntimeSupport.h
bjectivec/GPBRootObject.h
bjectivec/GPBRootObject.m
bjectivec/GPBRootObject_PackagePrivate.h
bjectivec/GPBRuntimeTypes.h
bjectivec/GPBUnknownField.h
bjectivec/GPBUnknownField.m
bjectivec/GPBUnknownFieldSet.h
bjectivec/GPBUnknownFieldSet.m
bjectivec/GPBUnknownFieldSet_PackagePrivate.h
bjectivec/GPBUnknownField_PackagePrivate.h
bjectivec/GPBUtilities.h
bjectivec/GPBUtilities.m
bjectivec/GPBUtilities_PackagePrivate.h
bjectivec/GPBWellKnownTypes.h
bjectivec/GPBWellKnownTypes.m
bjectivec/GPBWireFormat.h
bjectivec/GPBWireFormat.m
bjectivec/ProtocolBuffers_OSX.xcodeproj/project.pbxproj
bjectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/contents.xcworkspacedata
bjectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
bjectivec/ProtocolBuffers_OSX.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme
bjectivec/ProtocolBuffers_OSX.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme
bjectivec/ProtocolBuffers_iOS.xcodeproj/project.pbxproj
bjectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata
bjectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
bjectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcbaselines/8BBEA4A5147C727100C4ADB7.xcbaseline/FFE465CA-0E74-40E8-9F09-500B66B7DCB2.plist
bjectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcbaselines/8BBEA4A5147C727100C4ADB7.xcbaseline/Info.plist
bjectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme
bjectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme
bjectivec/README.md
bjectivec/Tests/GPBARCUnittestProtos.m
bjectivec/Tests/GPBArrayTests.m
bjectivec/Tests/GPBCodedInputStreamTests.m
bjectivec/Tests/GPBCodedOuputStreamTests.m
bjectivec/Tests/GPBConcurrencyTests.m
bjectivec/Tests/GPBDescriptorTests.m
bjectivec/Tests/GPBDictionaryTests+Bool.m
bjectivec/Tests/GPBDictionaryTests+Int32.m
bjectivec/Tests/GPBDictionaryTests+Int64.m
bjectivec/Tests/GPBDictionaryTests+String.m
bjectivec/Tests/GPBDictionaryTests+UInt32.m
bjectivec/Tests/GPBDictionaryTests+UInt64.m
bjectivec/Tests/GPBDictionaryTests.pddm
bjectivec/Tests/GPBMessageTests+Merge.m
bjectivec/Tests/GPBMessageTests+Runtime.m
bjectivec/Tests/GPBMessageTests+Serialization.m
bjectivec/Tests/GPBMessageTests.m
bjectivec/Tests/GPBObjectiveCPlusPlusTest.mm
bjectivec/Tests/GPBPerfTests.m
bjectivec/Tests/GPBSwiftTests.swift
bjectivec/Tests/GPBTestUtilities.h
bjectivec/Tests/GPBTestUtilities.m
bjectivec/Tests/GPBUnittestProtos.m
bjectivec/Tests/GPBUnknownFieldSetTest.m
bjectivec/Tests/GPBUtilitiesTests.m
bjectivec/Tests/GPBWellKnownTypesTest.m
bjectivec/Tests/GPBWireFormatTests.m
bjectivec/Tests/UnitTests-Bridging-Header.h
bjectivec/Tests/UnitTests-Info.plist
bjectivec/Tests/golden_message
bjectivec/Tests/golden_packed_fields_message
bjectivec/Tests/iOSTestHarness/AppDelegate.m
bjectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/Contents.json
bjectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad6.png
bjectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad6_2x.png
bjectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad7.png
bjectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad7_2x.png
bjectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone6.png
bjectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone6_2x.png
bjectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7_2x.png
bjectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7_3x.png
bjectivec/Tests/iOSTestHarness/Images.xcassets/LaunchImage.launchimage/Contents.json
bjectivec/Tests/iOSTestHarness/Info.plist
bjectivec/Tests/iOSTestHarness/LaunchScreen.xib
bjectivec/Tests/iOSTestHarness/en.lproj/InfoPlist.strings
bjectivec/Tests/text_format_map_unittest_data.txt
bjectivec/Tests/text_format_unittest_data.txt
bjectivec/Tests/unittest_cycle.proto
bjectivec/Tests/unittest_objc.proto
bjectivec/Tests/unittest_objc_startup.proto
bjectivec/Tests/unittest_runtime_proto2.proto
bjectivec/Tests/unittest_runtime_proto3.proto
bjectivec/generate_well_known_types.sh
bjectivec/google/protobuf/Any.pbobjc.h
bjectivec/google/protobuf/Any.pbobjc.m
bjectivec/google/protobuf/Api.pbobjc.h
bjectivec/google/protobuf/Api.pbobjc.m
bjectivec/google/protobuf/Duration.pbobjc.h
bjectivec/google/protobuf/Duration.pbobjc.m
bjectivec/google/protobuf/Empty.pbobjc.h
bjectivec/google/protobuf/Empty.pbobjc.m
bjectivec/google/protobuf/FieldMask.pbobjc.h
bjectivec/google/protobuf/FieldMask.pbobjc.m
bjectivec/google/protobuf/SourceContext.pbobjc.h
bjectivec/google/protobuf/SourceContext.pbobjc.m
bjectivec/google/protobuf/Struct.pbobjc.h
bjectivec/google/protobuf/Struct.pbobjc.m
bjectivec/google/protobuf/Timestamp.pbobjc.h
bjectivec/google/protobuf/Timestamp.pbobjc.m
bjectivec/google/protobuf/Type.pbobjc.h
bjectivec/google/protobuf/Type.pbobjc.m
bjectivec/google/protobuf/Wrappers.pbobjc.h
bjectivec/google/protobuf/Wrappers.pbobjc.m
hp/ext/google/protobuf/config.m4
hp/ext/google/protobuf/def.c
hp/ext/google/protobuf/message.c
hp/ext/google/protobuf/protobuf.c
hp/ext/google/protobuf/protobuf.h
hp/ext/google/protobuf/storage.c
hp/ext/google/protobuf/test.php
hp/ext/google/protobuf/upb.c
hp/ext/google/protobuf/upb.h
hp/tests/autoload.php
ost_process_dist.sh
rotobuf-lite.pc.in
rotobuf.bzl
rotobuf.pc.in
rotoc-artifacts/Dockerfile
rotoc-artifacts/README.md
rotoc-artifacts/build-protoc.sh
rotoc-artifacts/pom.xml
ython/MANIFEST.in
ython/README.md
ython/README.txt
ython/ez_setup.py
ython/google/__init__.py
ython/google/protobuf/__init__.py
ython/google/protobuf/descriptor.py
ython/google/protobuf/descriptor_database.py
ython/google/protobuf/descriptor_pool.py
ython/google/protobuf/internal/_parameterized.py
ython/google/protobuf/internal/any_test.proto
ython/google/protobuf/internal/api_implementation.cc
ython/google/protobuf/internal/api_implementation.py
ython/google/protobuf/internal/api_implementation_default_test.py
ython/google/protobuf/internal/containers.py
ython/google/protobuf/internal/cpp_message.py
ython/google/protobuf/internal/decoder.py
ython/google/protobuf/internal/descriptor_database_test.py
ython/google/protobuf/internal/descriptor_pool_test.py
ython/google/protobuf/internal/descriptor_pool_test1.proto
ython/google/protobuf/internal/descriptor_pool_test2.proto
ython/google/protobuf/internal/descriptor_python_test.py
ython/google/protobuf/internal/descriptor_test.py
ython/google/protobuf/internal/encoder.py
ython/google/protobuf/internal/factory_test1.proto
ython/google/protobuf/internal/factory_test2.proto
ython/google/protobuf/internal/generator_test.py
ython/google/protobuf/internal/import_test_package/__init__.py
ython/google/protobuf/internal/import_test_package/inner.proto
ython/google/protobuf/internal/import_test_package/outer.proto
ython/google/protobuf/internal/json_format_test.py
ython/google/protobuf/internal/message_factory_python_test.py
ython/google/protobuf/internal/message_factory_test.py
ython/google/protobuf/internal/message_python_test.py
ython/google/protobuf/internal/message_set_extensions.proto
ython/google/protobuf/internal/message_test.py
ython/google/protobuf/internal/missing_enum_values.proto
ython/google/protobuf/internal/more_extensions.proto
ython/google/protobuf/internal/more_extensions_dynamic.proto
ython/google/protobuf/internal/more_messages.proto
ython/google/protobuf/internal/packed_field_test.proto
ython/google/protobuf/internal/proto_builder_test.py
ython/google/protobuf/internal/python_message.py
ython/google/protobuf/internal/reflection_test.py
ython/google/protobuf/internal/service_reflection_test.py
ython/google/protobuf/internal/symbol_database_test.py
ython/google/protobuf/internal/test_bad_identifiers.proto
ython/google/protobuf/internal/test_util.py
ython/google/protobuf/internal/text_encoding_test.py
ython/google/protobuf/internal/text_format_test.py
ython/google/protobuf/internal/type_checkers.py
ython/google/protobuf/internal/unknown_fields_test.py
ython/google/protobuf/internal/well_known_types.py
ython/google/protobuf/internal/well_known_types_test.py
ython/google/protobuf/internal/wire_format_test.py
ython/google/protobuf/json_format.py
ython/google/protobuf/message.py
ython/google/protobuf/message_factory.py
ython/google/protobuf/proto_builder.py
ython/google/protobuf/pyext/__init__.py
ython/google/protobuf/pyext/cpp_message.py
ython/google/protobuf/pyext/descriptor.cc
ython/google/protobuf/pyext/descriptor.h
ython/google/protobuf/pyext/descriptor_containers.cc
ython/google/protobuf/pyext/descriptor_containers.h
ython/google/protobuf/pyext/descriptor_cpp2_test.py
ython/google/protobuf/pyext/descriptor_database.cc
ython/google/protobuf/pyext/descriptor_database.h
ython/google/protobuf/pyext/descriptor_pool.cc
ython/google/protobuf/pyext/descriptor_pool.h
ython/google/protobuf/pyext/extension_dict.cc
ython/google/protobuf/pyext/extension_dict.h
ython/google/protobuf/pyext/map_container.cc
ython/google/protobuf/pyext/map_container.h
ython/google/protobuf/pyext/message.cc
ython/google/protobuf/pyext/message.h
ython/google/protobuf/pyext/message_factory_cpp2_test.py
ython/google/protobuf/pyext/proto2_api_test.proto
ython/google/protobuf/pyext/python.proto
ython/google/protobuf/pyext/reflection_cpp2_generated_test.py
ython/google/protobuf/pyext/repeated_composite_container.cc
ython/google/protobuf/pyext/repeated_composite_container.h
ython/google/protobuf/pyext/repeated_scalar_container.cc
ython/google/protobuf/pyext/repeated_scalar_container.h
ython/google/protobuf/pyext/scoped_pyobject_ptr.h
ython/google/protobuf/reflection.py
ython/google/protobuf/symbol_database.py
ython/google/protobuf/text_encoding.py
ython/google/protobuf/text_format.py
ython/mox.py
ython/setup.py
ython/tox.ini
uby/.gitignore
uby/Gemfile
uby/Gemfile.lock
uby/README.md
uby/Rakefile
uby/ext/google/protobuf_c/defs.c
uby/ext/google/protobuf_c/encode_decode.c
uby/ext/google/protobuf_c/extconf.rb
uby/ext/google/protobuf_c/map.c
uby/ext/google/protobuf_c/message.c
uby/ext/google/protobuf_c/protobuf.c
uby/ext/google/protobuf_c/protobuf.h
uby/ext/google/protobuf_c/repeated_field.c
uby/ext/google/protobuf_c/storage.c
uby/ext/google/protobuf_c/upb.c
uby/ext/google/protobuf_c/upb.h
uby/google-protobuf.gemspec
uby/lib/google/protobuf.rb
uby/lib/google/protobuf/message_exts.rb
uby/lib/google/protobuf/repeated_field.rb
uby/pom.xml
uby/src/main/java/com/google/protobuf/jruby/RubyBuilder.java
uby/src/main/java/com/google/protobuf/jruby/RubyDescriptor.java
uby/src/main/java/com/google/protobuf/jruby/RubyDescriptorPool.java
uby/src/main/java/com/google/protobuf/jruby/RubyEnum.java
uby/src/main/java/com/google/protobuf/jruby/RubyEnumBuilderContext.java
uby/src/main/java/com/google/protobuf/jruby/RubyEnumDescriptor.java
uby/src/main/java/com/google/protobuf/jruby/RubyFieldDescriptor.java
uby/src/main/java/com/google/protobuf/jruby/RubyMap.java
uby/src/main/java/com/google/protobuf/jruby/RubyMessage.java
uby/src/main/java/com/google/protobuf/jruby/RubyMessageBuilderContext.java
uby/src/main/java/com/google/protobuf/jruby/RubyOneofBuilderContext.java
uby/src/main/java/com/google/protobuf/jruby/RubyOneofDescriptor.java
uby/src/main/java/com/google/protobuf/jruby/RubyProtobuf.java
uby/src/main/java/com/google/protobuf/jruby/RubyRepeatedField.java
uby/src/main/java/com/google/protobuf/jruby/SentinelOuterClass.java
uby/src/main/java/com/google/protobuf/jruby/Utils.java
uby/src/main/java/google/ProtobufJavaService.java
uby/src/main/sentinel.proto
uby/tests/basic.rb
uby/tests/generated_code.proto
uby/tests/generated_code_test.rb
uby/tests/repeated_field_test.rb
uby/tests/stress.rb
uby/travis-test.sh
ix.BUILD
rc/Makefile.am
rc/Makefile.in
rc/README.md
rc/google/protobuf/SEBS
rc/google/protobuf/any.cc
rc/google/protobuf/any.h
rc/google/protobuf/any.pb.cc
rc/google/protobuf/any.pb.h
rc/google/protobuf/any.proto
rc/google/protobuf/any_test.cc
rc/google/protobuf/any_test.proto
rc/google/protobuf/api.pb.cc
rc/google/protobuf/api.pb.h
rc/google/protobuf/api.proto
rc/google/protobuf/arena.cc
rc/google/protobuf/arena.h
rc/google/protobuf/arena_nc.cc
rc/google/protobuf/arena_nc_test.py
rc/google/protobuf/arena_test_util.cc
rc/google/protobuf/arena_test_util.h
rc/google/protobuf/arena_unittest.cc
rc/google/protobuf/arenastring.cc
rc/google/protobuf/arenastring.h
rc/google/protobuf/arenastring_unittest.cc
rc/google/protobuf/compiler/code_generator.cc
rc/google/protobuf/compiler/code_generator.h
rc/google/protobuf/compiler/command_line_interface.cc
rc/google/protobuf/compiler/command_line_interface.h
rc/google/protobuf/compiler/command_line_interface_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_enum.cc
rc/google/protobuf/compiler/cpp/cpp_enum.h
rc/google/protobuf/compiler/cpp/cpp_enum_field.cc
rc/google/protobuf/compiler/cpp/cpp_enum_field.h
rc/google/protobuf/compiler/cpp/cpp_extension.cc
rc/google/protobuf/compiler/cpp/cpp_extension.h
rc/google/protobuf/compiler/cpp/cpp_field.cc
rc/google/protobuf/compiler/cpp/cpp_field.h
rc/google/protobuf/compiler/cpp/cpp_file.cc
rc/google/protobuf/compiler/cpp/cpp_file.h
rc/google/protobuf/compiler/cpp/cpp_generator.cc
rc/google/protobuf/compiler/cpp/cpp_helpers.cc
rc/google/protobuf/compiler/cpp/cpp_helpers.h
rc/google/protobuf/compiler/cpp/cpp_map_field.cc
rc/google/protobuf/compiler/cpp/cpp_map_field.h
rc/google/protobuf/compiler/cpp/cpp_message.cc
rc/google/protobuf/compiler/cpp/cpp_message.h
rc/google/protobuf/compiler/cpp/cpp_message_field.cc
rc/google/protobuf/compiler/cpp/cpp_message_field.h
rc/google/protobuf/compiler/cpp/cpp_options.h
rc/google/protobuf/compiler/cpp/cpp_plugin_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_primitive_field.cc
rc/google/protobuf/compiler/cpp/cpp_primitive_field.h
rc/google/protobuf/compiler/cpp/cpp_service.cc
rc/google/protobuf/compiler/cpp/cpp_string_field.cc
rc/google/protobuf/compiler/cpp/cpp_string_field.h
rc/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto
rc/google/protobuf/compiler/cpp/cpp_test_large_enum_value.proto
rc/google/protobuf/compiler/cpp/cpp_unittest.cc
rc/google/protobuf/compiler/cpp/metadata_test.cc
rc/google/protobuf/compiler/csharp/csharp_doc_comment.cc
rc/google/protobuf/compiler/csharp/csharp_doc_comment.h
rc/google/protobuf/compiler/csharp/csharp_enum.cc
rc/google/protobuf/compiler/csharp/csharp_enum.h
rc/google/protobuf/compiler/csharp/csharp_enum_field.cc
rc/google/protobuf/compiler/csharp/csharp_enum_field.h
rc/google/protobuf/compiler/csharp/csharp_field_base.cc
rc/google/protobuf/compiler/csharp/csharp_field_base.h
rc/google/protobuf/compiler/csharp/csharp_generator.cc
rc/google/protobuf/compiler/csharp/csharp_generator.h
rc/google/protobuf/compiler/csharp/csharp_generator_unittest.cc
rc/google/protobuf/compiler/csharp/csharp_helpers.cc
rc/google/protobuf/compiler/csharp/csharp_helpers.h
rc/google/protobuf/compiler/csharp/csharp_map_field.cc
rc/google/protobuf/compiler/csharp/csharp_map_field.h
rc/google/protobuf/compiler/csharp/csharp_message.cc
rc/google/protobuf/compiler/csharp/csharp_message.h
rc/google/protobuf/compiler/csharp/csharp_message_field.cc
rc/google/protobuf/compiler/csharp/csharp_message_field.h
rc/google/protobuf/compiler/csharp/csharp_names.h
rc/google/protobuf/compiler/csharp/csharp_options.h
rc/google/protobuf/compiler/csharp/csharp_primitive_field.cc
rc/google/protobuf/compiler/csharp/csharp_primitive_field.h
rc/google/protobuf/compiler/csharp/csharp_reflection_class.cc
rc/google/protobuf/compiler/csharp/csharp_reflection_class.h
rc/google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc
rc/google/protobuf/compiler/csharp/csharp_repeated_enum_field.h
rc/google/protobuf/compiler/csharp/csharp_repeated_message_field.cc
rc/google/protobuf/compiler/csharp/csharp_repeated_message_field.h
rc/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc
rc/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.h
rc/google/protobuf/compiler/csharp/csharp_source_generator_base.cc
rc/google/protobuf/compiler/csharp/csharp_source_generator_base.h
rc/google/protobuf/compiler/csharp/csharp_wrapper_field.cc
rc/google/protobuf/compiler/csharp/csharp_wrapper_field.h
rc/google/protobuf/compiler/importer.cc
rc/google/protobuf/compiler/importer.h
rc/google/protobuf/compiler/importer_unittest.cc
rc/google/protobuf/compiler/java/java_context.cc
rc/google/protobuf/compiler/java/java_context.h
rc/google/protobuf/compiler/java/java_doc_comment.cc
rc/google/protobuf/compiler/java/java_enum.cc
rc/google/protobuf/compiler/java/java_enum_field.cc
rc/google/protobuf/compiler/java/java_enum_field.h
rc/google/protobuf/compiler/java/java_enum_field_lite.cc
rc/google/protobuf/compiler/java/java_enum_field_lite.h
rc/google/protobuf/compiler/java/java_enum_lite.cc
rc/google/protobuf/compiler/java/java_enum_lite.h
rc/google/protobuf/compiler/java/java_extension.cc
rc/google/protobuf/compiler/java/java_extension.h
rc/google/protobuf/compiler/java/java_extension_lite.cc
rc/google/protobuf/compiler/java/java_extension_lite.h
rc/google/protobuf/compiler/java/java_field.cc
rc/google/protobuf/compiler/java/java_field.h
rc/google/protobuf/compiler/java/java_file.cc
rc/google/protobuf/compiler/java/java_file.h
rc/google/protobuf/compiler/java/java_generator.cc
rc/google/protobuf/compiler/java/java_generator_factory.cc
rc/google/protobuf/compiler/java/java_helpers.cc
rc/google/protobuf/compiler/java/java_helpers.h
rc/google/protobuf/compiler/java/java_lazy_message_field.cc
rc/google/protobuf/compiler/java/java_lazy_message_field_lite.cc
rc/google/protobuf/compiler/java/java_lazy_message_field_lite.h
rc/google/protobuf/compiler/java/java_map_field.cc
rc/google/protobuf/compiler/java/java_map_field.h
rc/google/protobuf/compiler/java/java_map_field_lite.cc
rc/google/protobuf/compiler/java/java_map_field_lite.h
rc/google/protobuf/compiler/java/java_message.cc
rc/google/protobuf/compiler/java/java_message.h
rc/google/protobuf/compiler/java/java_message_builder.cc
rc/google/protobuf/compiler/java/java_message_builder.h
rc/google/protobuf/compiler/java/java_message_builder_lite.cc
rc/google/protobuf/compiler/java/java_message_builder_lite.h
rc/google/protobuf/compiler/java/java_message_field.cc
rc/google/protobuf/compiler/java/java_message_field_lite.cc
rc/google/protobuf/compiler/java/java_message_field_lite.h
rc/google/protobuf/compiler/java/java_message_lite.cc
rc/google/protobuf/compiler/java/java_message_lite.h
rc/google/protobuf/compiler/java/java_name_resolver.cc
rc/google/protobuf/compiler/java/java_name_resolver.h
rc/google/protobuf/compiler/java/java_names.h
rc/google/protobuf/compiler/java/java_plugin_unittest.cc
rc/google/protobuf/compiler/java/java_primitive_field.cc
rc/google/protobuf/compiler/java/java_primitive_field_lite.cc
rc/google/protobuf/compiler/java/java_primitive_field_lite.h
rc/google/protobuf/compiler/java/java_service.cc
rc/google/protobuf/compiler/java/java_shared_code_generator.cc
rc/google/protobuf/compiler/java/java_shared_code_generator.h
rc/google/protobuf/compiler/java/java_string_field.cc
rc/google/protobuf/compiler/java/java_string_field.h
rc/google/protobuf/compiler/java/java_string_field_lite.cc
rc/google/protobuf/compiler/java/java_string_field_lite.h
rc/google/protobuf/compiler/javanano/javanano_enum.h
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_enum_field.h
rc/google/protobuf/compiler/javanano/javanano_extension.h
rc/google/protobuf/compiler/javanano/javanano_field.cc
rc/google/protobuf/compiler/javanano/javanano_field.h
rc/google/protobuf/compiler/javanano/javanano_file.cc
rc/google/protobuf/compiler/javanano/javanano_file.h
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_generator.h
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.h
rc/google/protobuf/compiler/javanano/javanano_map_field.cc
rc/google/protobuf/compiler/javanano/javanano_map_field.h
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_message.h
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.h
rc/google/protobuf/compiler/javanano/javanano_params.h
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.h
rc/google/protobuf/compiler/js/js_generator.cc
rc/google/protobuf/compiler/js/js_generator.h
rc/google/protobuf/compiler/main.cc
rc/google/protobuf/compiler/mock_code_generator.cc
rc/google/protobuf/compiler/mock_code_generator.h
rc/google/protobuf/compiler/objectivec/objectivec_enum.cc
rc/google/protobuf/compiler/objectivec/objectivec_enum.h
rc/google/protobuf/compiler/objectivec/objectivec_enum_field.cc
rc/google/protobuf/compiler/objectivec/objectivec_enum_field.h
rc/google/protobuf/compiler/objectivec/objectivec_extension.cc
rc/google/protobuf/compiler/objectivec/objectivec_extension.h
rc/google/protobuf/compiler/objectivec/objectivec_field.cc
rc/google/protobuf/compiler/objectivec/objectivec_field.h
rc/google/protobuf/compiler/objectivec/objectivec_file.cc
rc/google/protobuf/compiler/objectivec/objectivec_file.h
rc/google/protobuf/compiler/objectivec/objectivec_generator.cc
rc/google/protobuf/compiler/objectivec/objectivec_generator.h
rc/google/protobuf/compiler/objectivec/objectivec_helpers.cc
rc/google/protobuf/compiler/objectivec/objectivec_helpers.h
rc/google/protobuf/compiler/objectivec/objectivec_helpers_unittest.cc
rc/google/protobuf/compiler/objectivec/objectivec_map_field.cc
rc/google/protobuf/compiler/objectivec/objectivec_map_field.h
rc/google/protobuf/compiler/objectivec/objectivec_message.cc
rc/google/protobuf/compiler/objectivec/objectivec_message.h
rc/google/protobuf/compiler/objectivec/objectivec_message_field.cc
rc/google/protobuf/compiler/objectivec/objectivec_message_field.h
rc/google/protobuf/compiler/objectivec/objectivec_oneof.cc
rc/google/protobuf/compiler/objectivec/objectivec_oneof.h
rc/google/protobuf/compiler/objectivec/objectivec_primitive_field.cc
rc/google/protobuf/compiler/objectivec/objectivec_primitive_field.h
rc/google/protobuf/compiler/parser.cc
rc/google/protobuf/compiler/parser.h
rc/google/protobuf/compiler/parser_unittest.cc
rc/google/protobuf/compiler/plugin.cc
rc/google/protobuf/compiler/plugin.h
rc/google/protobuf/compiler/plugin.pb.cc
rc/google/protobuf/compiler/plugin.pb.h
rc/google/protobuf/compiler/plugin.proto
rc/google/protobuf/compiler/python/python_generator.cc
rc/google/protobuf/compiler/python/python_generator.h
rc/google/protobuf/compiler/python/python_plugin_unittest.cc
rc/google/protobuf/compiler/ruby/ruby_generated_code.proto
rc/google/protobuf/compiler/ruby/ruby_generated_code.rb
rc/google/protobuf/compiler/ruby/ruby_generator.cc
rc/google/protobuf/compiler/ruby/ruby_generator.h
rc/google/protobuf/compiler/ruby/ruby_generator_unittest.cc
rc/google/protobuf/compiler/subprocess.cc
rc/google/protobuf/descriptor.cc
rc/google/protobuf/descriptor.h
rc/google/protobuf/descriptor.pb.cc
rc/google/protobuf/descriptor.pb.h
rc/google/protobuf/descriptor.proto
rc/google/protobuf/descriptor_database.cc
rc/google/protobuf/descriptor_database.h
rc/google/protobuf/descriptor_database_unittest.cc
rc/google/protobuf/descriptor_pb2_test.py
rc/google/protobuf/descriptor_unittest.cc
rc/google/protobuf/drop_unknown_fields_test.cc
rc/google/protobuf/duration.pb.cc
rc/google/protobuf/duration.pb.h
rc/google/protobuf/duration.proto
rc/google/protobuf/dynamic_message.cc
rc/google/protobuf/dynamic_message.h
rc/google/protobuf/dynamic_message_unittest.cc
rc/google/protobuf/empty.pb.cc
rc/google/protobuf/empty.pb.h
rc/google/protobuf/empty.proto
rc/google/protobuf/extension_set.cc
rc/google/protobuf/extension_set.h
rc/google/protobuf/extension_set_heavy.cc
rc/google/protobuf/extension_set_unittest.cc
rc/google/protobuf/field_mask.pb.cc
rc/google/protobuf/field_mask.pb.h
rc/google/protobuf/field_mask.proto
rc/google/protobuf/generated_enum_reflection.h
rc/google/protobuf/generated_enum_util.h
rc/google/protobuf/generated_message_reflection.cc
rc/google/protobuf/generated_message_reflection.h
rc/google/protobuf/generated_message_reflection_unittest.cc
rc/google/protobuf/generated_message_util.cc
rc/google/protobuf/generated_message_util.h
rc/google/protobuf/io/coded_stream.cc
rc/google/protobuf/io/coded_stream.h
rc/google/protobuf/io/coded_stream_inl.h
rc/google/protobuf/io/coded_stream_unittest.cc
rc/google/protobuf/io/gzip_stream.cc
rc/google/protobuf/io/gzip_stream.h
rc/google/protobuf/io/printer.cc
rc/google/protobuf/io/printer.h
rc/google/protobuf/io/printer_unittest.cc
rc/google/protobuf/io/strtod.cc
rc/google/protobuf/io/strtod.h
rc/google/protobuf/io/tokenizer.cc
rc/google/protobuf/io/tokenizer.h
rc/google/protobuf/io/tokenizer_unittest.cc
rc/google/protobuf/io/zero_copy_stream.cc
rc/google/protobuf/io/zero_copy_stream_impl.cc
rc/google/protobuf/io/zero_copy_stream_impl_lite.cc
rc/google/protobuf/io/zero_copy_stream_impl_lite.h
rc/google/protobuf/io/zero_copy_stream_unittest.cc
rc/google/protobuf/lite_arena_unittest.cc
rc/google/protobuf/lite_unittest.cc
rc/google/protobuf/map.h
rc/google/protobuf/map_entry.h
rc/google/protobuf/map_entry_lite.h
rc/google/protobuf/map_field.cc
rc/google/protobuf/map_field.h
rc/google/protobuf/map_field_inl.h
rc/google/protobuf/map_field_lite.h
rc/google/protobuf/map_field_test.cc
rc/google/protobuf/map_lite_test_util.cc
rc/google/protobuf/map_lite_test_util.h
rc/google/protobuf/map_lite_unittest.proto
rc/google/protobuf/map_proto2_unittest.proto
rc/google/protobuf/map_test.cc
rc/google/protobuf/map_test_util.cc
rc/google/protobuf/map_test_util.h
rc/google/protobuf/map_test_util_impl.h
rc/google/protobuf/map_type_handler.h
rc/google/protobuf/map_unittest.proto
rc/google/protobuf/map_unittest_proto3.proto
rc/google/protobuf/message.cc
rc/google/protobuf/message.h
rc/google/protobuf/message_lite.cc
rc/google/protobuf/message_lite.h
rc/google/protobuf/message_unittest.cc
rc/google/protobuf/metadata.h
rc/google/protobuf/no_field_presence_test.cc
rc/google/protobuf/preserve_unknown_enum_test.cc
rc/google/protobuf/proto3_arena_lite_unittest.cc
rc/google/protobuf/proto3_arena_unittest.cc
rc/google/protobuf/proto3_lite_unittest.cc
rc/google/protobuf/reflection.h
rc/google/protobuf/reflection_internal.h
rc/google/protobuf/reflection_ops_unittest.cc
rc/google/protobuf/repeated_field.cc
rc/google/protobuf/repeated_field.h
rc/google/protobuf/repeated_field_reflection.h
rc/google/protobuf/repeated_field_reflection_unittest.cc
rc/google/protobuf/repeated_field_unittest.cc
rc/google/protobuf/service.h
rc/google/protobuf/source_context.pb.cc
rc/google/protobuf/source_context.pb.h
rc/google/protobuf/source_context.proto
rc/google/protobuf/struct.pb.cc
rc/google/protobuf/struct.pb.h
rc/google/protobuf/struct.proto
rc/google/protobuf/stubs/atomic_sequence_num.h
rc/google/protobuf/stubs/atomicops.h
rc/google/protobuf/stubs/atomicops_internals_generic_gcc.h
rc/google/protobuf/stubs/atomicops_internals_mips_gcc.h
rc/google/protobuf/stubs/atomicops_internals_pnacl.h
rc/google/protobuf/stubs/atomicops_internals_power.h
rc/google/protobuf/stubs/atomicops_internals_ppc_gcc.h
rc/google/protobuf/stubs/bytestream.cc
rc/google/protobuf/stubs/bytestream.h
rc/google/protobuf/stubs/bytestream_unittest.cc
rc/google/protobuf/stubs/callback.h
rc/google/protobuf/stubs/casts.h
rc/google/protobuf/stubs/common.cc
rc/google/protobuf/stubs/common.h
rc/google/protobuf/stubs/common_unittest.cc
rc/google/protobuf/stubs/fastmem.h
rc/google/protobuf/stubs/hash.cc
rc/google/protobuf/stubs/hash.h
rc/google/protobuf/stubs/int128.cc
rc/google/protobuf/stubs/int128.h
rc/google/protobuf/stubs/int128_unittest.cc
rc/google/protobuf/stubs/logging.h
rc/google/protobuf/stubs/macros.h
rc/google/protobuf/stubs/map-util.h
rc/google/protobuf/stubs/map_util.h
rc/google/protobuf/stubs/mathlimits.cc
rc/google/protobuf/stubs/mathlimits.h
rc/google/protobuf/stubs/mathutil.h
rc/google/protobuf/stubs/mutex.h
rc/google/protobuf/stubs/once.h
rc/google/protobuf/stubs/once_unittest.cc
rc/google/protobuf/stubs/platform_macros.h
rc/google/protobuf/stubs/port.h
rc/google/protobuf/stubs/scoped_ptr.h
rc/google/protobuf/stubs/shared_ptr.h
rc/google/protobuf/stubs/singleton.h
rc/google/protobuf/stubs/status.cc
rc/google/protobuf/stubs/status.h
rc/google/protobuf/stubs/status_macros.h
rc/google/protobuf/stubs/status_test.cc
rc/google/protobuf/stubs/statusor.cc
rc/google/protobuf/stubs/statusor.h
rc/google/protobuf/stubs/statusor_test.cc
rc/google/protobuf/stubs/stl_util-inl.h
rc/google/protobuf/stubs/stringpiece.cc
rc/google/protobuf/stubs/stringpiece.h
rc/google/protobuf/stubs/stringpiece_unittest.cc
rc/google/protobuf/stubs/stringprintf.cc
rc/google/protobuf/stubs/structurally_valid.cc
rc/google/protobuf/stubs/strutil.cc
rc/google/protobuf/stubs/strutil.h
rc/google/protobuf/stubs/strutil_unittest.cc
rc/google/protobuf/stubs/template_util.h
rc/google/protobuf/stubs/time.cc
rc/google/protobuf/stubs/time.h
rc/google/protobuf/stubs/time_test.cc
rc/google/protobuf/stubs/type_traits.h
rc/google/protobuf/stubs/type_traits_unittest.cc
rc/google/protobuf/test_util.cc
rc/google/protobuf/test_util.h
rc/google/protobuf/test_util_lite.cc
rc/google/protobuf/test_util_lite.h
rc/google/protobuf/testdata/golden_message_proto3
rc/google/protobuf/testdata/map_test_data.txt
rc/google/protobuf/testing/file.cc
rc/google/protobuf/testing/file.h
rc/google/protobuf/testing/googletest.cc
rc/google/protobuf/testing/zcgunzip.cc
rc/google/protobuf/testing/zcgzip.cc
rc/google/protobuf/text_format.cc
rc/google/protobuf/text_format.h
rc/google/protobuf/text_format_unittest.cc
rc/google/protobuf/timestamp.pb.cc
rc/google/protobuf/timestamp.pb.h
rc/google/protobuf/timestamp.proto
rc/google/protobuf/type.pb.cc
rc/google/protobuf/type.pb.h
rc/google/protobuf/type.proto
rc/google/protobuf/unittest.proto
rc/google/protobuf/unittest_accessors_nano.proto
rc/google/protobuf/unittest_arena.proto
rc/google/protobuf/unittest_bytes_offset_length_nano.proto
rc/google/protobuf/unittest_custom_options.proto
rc/google/protobuf/unittest_drop_unknown_fields.proto
rc/google/protobuf/unittest_embed_optimize_for.proto
rc/google/protobuf/unittest_empty.proto
rc/google/protobuf/unittest_enormous_descriptor.proto
rc/google/protobuf/unittest_enum_class_multiple_nano.proto
rc/google/protobuf/unittest_enum_class_nano.proto
rc/google/protobuf/unittest_enum_validity_nano.proto
rc/google/protobuf/unittest_extension_nano.proto
rc/google/protobuf/unittest_extension_packed_nano.proto
rc/google/protobuf/unittest_extension_repeated_nano.proto
rc/google/protobuf/unittest_extension_singular_nano.proto
rc/google/protobuf/unittest_has_nano.proto
rc/google/protobuf/unittest_import.proto
rc/google/protobuf/unittest_import_lite.proto
rc/google/protobuf/unittest_import_micro.proto
rc/google/protobuf/unittest_import_nano.proto
rc/google/protobuf/unittest_import_proto3.proto
rc/google/protobuf/unittest_import_public.proto
rc/google/protobuf/unittest_import_public_lite.proto
rc/google/protobuf/unittest_import_public_proto3.proto
rc/google/protobuf/unittest_lite.proto
rc/google/protobuf/unittest_lite_imports_nonlite.proto
rc/google/protobuf/unittest_micro.proto
rc/google/protobuf/unittest_mset.proto
rc/google/protobuf/unittest_mset_wire_format.proto
rc/google/protobuf/unittest_multiple_micro.proto
rc/google/protobuf/unittest_multiple_nameclash_micro.proto
rc/google/protobuf/unittest_multiple_nameclash_nano.proto
rc/google/protobuf/unittest_multiple_nano.proto
rc/google/protobuf/unittest_nano.proto
rc/google/protobuf/unittest_no_arena.proto
rc/google/protobuf/unittest_no_arena_import.proto
rc/google/protobuf/unittest_no_arena_lite.proto
rc/google/protobuf/unittest_no_field_presence.proto
rc/google/protobuf/unittest_no_generic_services.proto
rc/google/protobuf/unittest_optimize_for.proto
rc/google/protobuf/unittest_preserve_unknown_enum.proto
rc/google/protobuf/unittest_preserve_unknown_enum2.proto
rc/google/protobuf/unittest_proto3.proto
rc/google/protobuf/unittest_proto3_arena.proto
rc/google/protobuf/unittest_proto3_arena_lite.proto
rc/google/protobuf/unittest_proto3_lite.proto
rc/google/protobuf/unittest_recursive_micro.proto
rc/google/protobuf/unittest_recursive_nano.proto
rc/google/protobuf/unittest_reference_types_nano.proto
rc/google/protobuf/unittest_repeated_merge_nano.proto
rc/google/protobuf/unittest_repeated_packables_nano.proto
rc/google/protobuf/unittest_simple_micro.proto
rc/google/protobuf/unittest_simple_nano.proto
rc/google/protobuf/unittest_single_micro.proto
rc/google/protobuf/unittest_single_nano.proto
rc/google/protobuf/unittest_stringutf8_micro.proto
rc/google/protobuf/unittest_stringutf8_nano.proto
rc/google/protobuf/unittest_unknown_enum_values_nano.proto
rc/google/protobuf/unittest_well_known_types.proto
rc/google/protobuf/unknown_field_set.cc
rc/google/protobuf/unknown_field_set.h
rc/google/protobuf/unknown_field_set_unittest.cc
rc/google/protobuf/util/field_comparator.cc
rc/google/protobuf/util/field_comparator.h
rc/google/protobuf/util/field_comparator_test.cc
rc/google/protobuf/util/field_mask_util.cc
rc/google/protobuf/util/field_mask_util.h
rc/google/protobuf/util/field_mask_util_test.cc
rc/google/protobuf/util/internal/constants.h
rc/google/protobuf/util/internal/datapiece.cc
rc/google/protobuf/util/internal/datapiece.h
rc/google/protobuf/util/internal/default_value_objectwriter.cc
rc/google/protobuf/util/internal/default_value_objectwriter.h
rc/google/protobuf/util/internal/default_value_objectwriter_test.cc
rc/google/protobuf/util/internal/error_listener.cc
rc/google/protobuf/util/internal/error_listener.h
rc/google/protobuf/util/internal/expecting_objectwriter.h
rc/google/protobuf/util/internal/field_mask_utility.cc
rc/google/protobuf/util/internal/field_mask_utility.h
rc/google/protobuf/util/internal/json_escaping.cc
rc/google/protobuf/util/internal/json_escaping.h
rc/google/protobuf/util/internal/json_objectwriter.cc
rc/google/protobuf/util/internal/json_objectwriter.h
rc/google/protobuf/util/internal/json_objectwriter_test.cc
rc/google/protobuf/util/internal/json_stream_parser.cc
rc/google/protobuf/util/internal/json_stream_parser.h
rc/google/protobuf/util/internal/json_stream_parser_test.cc
rc/google/protobuf/util/internal/location_tracker.h
rc/google/protobuf/util/internal/mock_error_listener.h
rc/google/protobuf/util/internal/object_location_tracker.h
rc/google/protobuf/util/internal/object_source.h
rc/google/protobuf/util/internal/object_writer.cc
rc/google/protobuf/util/internal/object_writer.h
rc/google/protobuf/util/internal/proto_writer.cc
rc/google/protobuf/util/internal/proto_writer.h
rc/google/protobuf/util/internal/protostream_objectsource.cc
rc/google/protobuf/util/internal/protostream_objectsource.h
rc/google/protobuf/util/internal/protostream_objectsource_test.cc
rc/google/protobuf/util/internal/protostream_objectwriter.cc
rc/google/protobuf/util/internal/protostream_objectwriter.h
rc/google/protobuf/util/internal/protostream_objectwriter_test.cc
rc/google/protobuf/util/internal/structured_objectwriter.h
rc/google/protobuf/util/internal/testdata/anys.proto
rc/google/protobuf/util/internal/testdata/books.proto
rc/google/protobuf/util/internal/testdata/default_value.proto
rc/google/protobuf/util/internal/testdata/default_value_test.proto
rc/google/protobuf/util/internal/testdata/field_mask.proto
rc/google/protobuf/util/internal/testdata/maps.proto
rc/google/protobuf/util/internal/testdata/oneofs.proto
rc/google/protobuf/util/internal/testdata/struct.proto
rc/google/protobuf/util/internal/testdata/timestamp_duration.proto
rc/google/protobuf/util/internal/testdata/wrappers.proto
rc/google/protobuf/util/internal/type_info.cc
rc/google/protobuf/util/internal/type_info.h
rc/google/protobuf/util/internal/type_info_test_helper.cc
rc/google/protobuf/util/internal/type_info_test_helper.h
rc/google/protobuf/util/internal/utility.cc
rc/google/protobuf/util/internal/utility.h
rc/google/protobuf/util/json_format_proto3.proto
rc/google/protobuf/util/json_util.cc
rc/google/protobuf/util/json_util.h
rc/google/protobuf/util/json_util_test.cc
rc/google/protobuf/util/message_differencer.cc
rc/google/protobuf/util/message_differencer.h
rc/google/protobuf/util/message_differencer_unittest.cc
rc/google/protobuf/util/message_differencer_unittest.proto
rc/google/protobuf/util/time_util.cc
rc/google/protobuf/util/time_util.h
rc/google/protobuf/util/time_util_test.cc
rc/google/protobuf/util/type_resolver.h
rc/google/protobuf/util/type_resolver_util.cc
rc/google/protobuf/util/type_resolver_util.h
rc/google/protobuf/util/type_resolver_util_test.cc
rc/google/protobuf/well_known_types_unittest.cc
rc/google/protobuf/wire_format.cc
rc/google/protobuf/wire_format.h
rc/google/protobuf/wire_format_lite.cc
rc/google/protobuf/wire_format_lite.h
rc/google/protobuf/wire_format_lite_inl.h
rc/google/protobuf/wire_format_unittest.cc
rc/google/protobuf/wrappers.pb.cc
rc/google/protobuf/wrappers.pb.h
rc/google/protobuf/wrappers.proto
ests.sh
pdate_file_lists.sh
til/BUILD
til/CHANGES.txt
til/CONTRIBUTORS.txt
til/LICENSE
til/Makefile.am
til/Protobuf.podspec
til/README.md
til/WORKSPACE
til/appveyor.bat
til/appveyor.yml
til/autogen.sh
til/configure.ac
til/generate_descriptor_proto.sh
til/gmock.BUILD
til/post_process_dist.sh
til/protobuf-lite.pc.in
til/protobuf.bzl
til/protobuf.pc.in
til/python/BUILD
til/six.BUILD
til/tests.sh
til/update_file_lists.sh
sprojects/config.h
sprojects/convert2008to2005.sh
sprojects/extract_includes.bat
sprojects/libprotobuf-lite.vcproj
sprojects/libprotobuf.vcproj
sprojects/libprotoc.vcproj
sprojects/lite-test.vcproj
sprojects/protobuf.sln
sprojects/protoc.vcproj
sprojects/readme.txt
sprojects/test_plugin.vcproj
sprojects/tests.vcproj
43aef89b6a51f835bcdd5fa317aee3ce5d264cdf 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> DO NOT MERGE: Revert "Fix the Gradle build file after the proto3 update"

This reverts commit 91f7e3d8935806f203d8ec3fa8aa39797d5bf315.

Change-Id: I10ea410a454f5c0c2ab4a2732081469f68d7f62e
uild.gradle
fbbea2898e10d4990076202f9a79784a9e7ab3ad 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> DO NOT MERGE: Revert "Add a flag to use offset/length with byte arrays."

This reverts commit 4d68239ebccff1e3f20f43be4e00b6a9e24bb57e.

Change-Id: I56d34031c018722f5775bab8e56d2e38afc852bc
avanano/pom.xml
avanano/src/main/java/com/google/protobuf/nano/CodedInputByteBufferNano.java
avanano/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java
avanano/src/test/java/com/google/protobuf/nano/NanoTest.java
avanano/src/test/java/com/google/protobuf/nano/unittest_bytes_offset_length_nano.proto
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_params.h
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.h
6f1886b818e9795e26316bc6936af71804a61f3b 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> DO NOT MERGE: Revert "Parse unknown enum values like full proto2."

This reverts commit 3686bacb71a018d1524459649c3a9310da999d95.

Change-Id: If05a55726eaa8e948ea50b8d7dbf05dd90bfb666
avanano/pom.xml
avanano/src/test/java/com/google/protobuf/nano/NanoTest.java
avanano/src/test/java/com/google/protobuf/nano/unittest_unknown_enum_values.proto
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
01badb543de6143cde2933cc7b8c88562170cd31 18-Jan-2017 Jeff Davidson <jpd@google.com> Parse unknown enum values like full proto2.
am: 3686bacb71

Change-Id: Ic9089b3c7cc03e6ac81f4de486432ccaa20353a8
dbe8383ccc5e1b0df4a73da1b73de9d8385a180d 18-Jan-2017 Jeff Davidson <jpd@google.com> Add a flag to use offset/length with byte arrays.
am: 4d68239ebc

Change-Id: I0610f3673bd992dd06af3af23ababd1b77b79141
ebd9efcb7604ed5533a07e924f0b10b3f7d3136e 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> Fix the Gradle build file after the proto3 update
am: 91f7e3d893

Change-Id: I3a5ca70614e6eaf6aae3c3ece5805f8e679a9115
1d13423f216c7afed44b46f0f4f00a7406a8d3b4 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> Merge remote-tracking branch 'goog/protobuf3' into 'goog/master'
am: f1ee8f0477

Change-Id: Icb381f8d94dff604f5519d2d70402c4ffd8c5844
3686bacb71a018d1524459649c3a9310da999d95 08-Mar-2016 Jeff Davidson <jpd@google.com> Parse unknown enum values like full proto2.

Store unknown values in the unknown field set. For repeated fields,
store unknown values while leaving known values in place.

This can lead to some strange behaviors, such as new values not being
serialized (because the unknown field set copy comes second on the
wire), or the order of repeated fields changing (if the value is
serialized when the field is unknown, and deserialized later when it
becomes known). Having strange behavior be consistent with the
standard implementation is nonetheless better than diverging.

Bug: 26337187
Change-Id: I9fee24d05d387a46e15b07c7a8a97704b76b5f27
(cherry picked from commit 21a20ad7bd239b9120a5426f4a793bc9c213558f)
avanano/pom.xml
avanano/src/test/java/com/google/protobuf/nano/NanoTest.java
avanano/src/test/java/com/google/protobuf/nano/unittest_unknown_enum_values.proto
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
4d68239ebccff1e3f20f43be4e00b6a9e24bb57e 08-May-2015 Jeff Davidson <jpd@google.com> Add a flag to use offset/length with byte arrays.

This is an advanced option that most users won't want/need. However,
it can greatly optimize flows where we want to reuse byte[] buffers
from other locations without having to first copy the contents into
a new array of the exact correct size.

Bug: 20636336
Change-Id: Ia8d0af82e952858f9571f84110da621da776619c
(cherry picked from commit 137226a921d0f50c9e8a9f3ae43a3459b48d18a1)
avanano/pom.xml
avanano/src/main/java/com/google/protobuf/nano/CodedInputByteBufferNano.java
avanano/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java
avanano/src/test/java/com/google/protobuf/nano/NanoTest.java
avanano/src/test/java/com/google/protobuf/nano/unittest_bytes_offset_length_nano.proto
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_params.h
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.h
91f7e3d8935806f203d8ec3fa8aa39797d5bf315 10-Nov-2016 Tamas Berghammer <tberghammer@google.com> Fix the Gradle build file after the proto3 update

Change-Id: Id57a19b706cedb441bcb1e84c679978e8ea0ccf6
(cherry picked from commit 99498c68b476186599af77d620f19d4123b0ff8b)
uild.gradle
f1ee8f047793dc05a7f827410b9cdd4447842380 26-Sep-2016 Tamas Berghammer <tberghammer@google.com> Merge remote-tracking branch 'goog/protobuf3' into 'goog/master'

This merge updates protobuf from v2.6.1 to v3.0.0-beta3.

Local modifications compared to upstream done during the merge:
* Updated list of C++/Java sources in Android.mk
* Register the Android specific java micro compiler
* Migrate android specific tests to new package names
* Automatically detect RTTI from compiler defined macros
* Fix build when compiled with stlport

Bug: b/28974522
Change-Id: I76344103ff2fa60951aa3ab3103b1bfa03742e71
(cherry picked from commit bda916c42b4fd3d235d0c49d249f03c34de77558)
gitignore
ndroid.bp
ndroid.mk
UILD
HANGES.txt
ONTRIBUTORS.txt
ICENSE
akefile.am
akefile.in
rotobuf.podspec
EADME.md
ORKSPACE
ppveyor.bat
ppveyor.yml
utogen.sh
enchmarks/Makefile.am
enchmarks/README.md
enchmarks/benchmark_messages_proto2.proto
enchmarks/benchmark_messages_proto3.proto
enchmarks/benchmarks.proto
enchmarks/generate_datasets.cc
enchmarks/google_size.proto
enchmarks/google_speed.proto
uild.gradle
make/CMakeLists.txt
make/README.md
make/extract_includes.bat.in
make/install.cmake
make/libprotobuf-lite.cmake
make/libprotobuf.cmake
make/libprotoc.cmake
make/protobuf-config-version.cmake.in
make/protobuf-config.cmake.in
make/protobuf-module.cmake.in
make/protoc.cmake
make/tests.cmake
onfigure.ac
onformance/ConformanceJava.java
onformance/ConformanceJavaLite.java
onformance/Makefile.am
onformance/README.md
onformance/conformance.proto
onformance/conformance_cpp.cc
onformance/conformance_objc.m
onformance/conformance_python.py
onformance/conformance_ruby.rb
onformance/conformance_test.cc
onformance/conformance_test.h
onformance/conformance_test_runner.cc
onformance/failure_list_cpp.txt
onformance/failure_list_csharp.txt
onformance/failure_list_java.txt
onformance/failure_list_objc.txt
onformance/failure_list_python-post26.txt
onformance/failure_list_python.txt
onformance/failure_list_python_cpp.txt
onformance/failure_list_ruby.txt
onformance/third_party/jsoncpp/json.h
onformance/third_party/jsoncpp/jsoncpp.cpp
sharp/.gitignore
sharp/CHANGES.txt
sharp/Google.Protobuf.Tools.nuspec
sharp/README.md
sharp/build_packages.bat
sharp/buildall.sh
sharp/generate_protos.sh
sharp/keys/Google.Protobuf.public.snk
sharp/keys/Google.Protobuf.snk
sharp/keys/README.md
sharp/protos/unittest_issues.proto
sharp/src/AddressBook/AddPerson.cs
sharp/src/AddressBook/AddressBook.csproj
sharp/src/AddressBook/Addressbook.cs
sharp/src/AddressBook/ListPeople.cs
sharp/src/AddressBook/Program.cs
sharp/src/AddressBook/Properties/AssemblyInfo.cs
sharp/src/AddressBook/SampleUsage.cs
sharp/src/AddressBook/app.config
sharp/src/Google.Protobuf.Conformance/App.config
sharp/src/Google.Protobuf.Conformance/Conformance.cs
sharp/src/Google.Protobuf.Conformance/Google.Protobuf.Conformance.csproj
sharp/src/Google.Protobuf.Conformance/Program.cs
sharp/src/Google.Protobuf.Conformance/Properties/AssemblyInfo.cs
sharp/src/Google.Protobuf.JsonDump/Google.Protobuf.JsonDump.csproj
sharp/src/Google.Protobuf.JsonDump/Program.cs
sharp/src/Google.Protobuf.JsonDump/Properties/AssemblyInfo.cs
sharp/src/Google.Protobuf.JsonDump/app.config
sharp/src/Google.Protobuf.Test/ByteStringTest.cs
sharp/src/Google.Protobuf.Test/CodedInputStreamExtensions.cs
sharp/src/Google.Protobuf.Test/CodedInputStreamTest.cs
sharp/src/Google.Protobuf.Test/CodedOutputStreamTest.cs
sharp/src/Google.Protobuf.Test/Collections/MapFieldTest.cs
sharp/src/Google.Protobuf.Test/Collections/RepeatedFieldTest.cs
sharp/src/Google.Protobuf.Test/Compatibility/PropertyInfoExtensionsTest.cs
sharp/src/Google.Protobuf.Test/Compatibility/TypeExtensionsTest.cs
sharp/src/Google.Protobuf.Test/DeprecatedMemberTest.cs
sharp/src/Google.Protobuf.Test/EqualityTester.cs
sharp/src/Google.Protobuf.Test/FieldCodecTest.cs
sharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs
sharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj
sharp/src/Google.Protobuf.Test/IssuesTest.cs
sharp/src/Google.Protobuf.Test/JsonFormatterTest.cs
sharp/src/Google.Protobuf.Test/JsonParserTest.cs
sharp/src/Google.Protobuf.Test/JsonTokenizerTest.cs
sharp/src/Google.Protobuf.Test/Properties/AppManifest.xml
sharp/src/Google.Protobuf.Test/Properties/AssemblyInfo.cs
sharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs
sharp/src/Google.Protobuf.Test/Reflection/FieldAccessTest.cs
sharp/src/Google.Protobuf.Test/Reflection/TypeRegistryTest.cs
sharp/src/Google.Protobuf.Test/SampleEnum.cs
sharp/src/Google.Protobuf.Test/SampleMessages.cs
sharp/src/Google.Protobuf.Test/TestCornerCases.cs
sharp/src/Google.Protobuf.Test/TestProtos/ForeignMessagePartial.cs
sharp/src/Google.Protobuf.Test/TestProtos/MapUnittestProto3.cs
sharp/src/Google.Protobuf.Test/TestProtos/UnittestImportProto3.cs
sharp/src/Google.Protobuf.Test/TestProtos/UnittestImportPublicProto3.cs
sharp/src/Google.Protobuf.Test/TestProtos/UnittestIssues.cs
sharp/src/Google.Protobuf.Test/TestProtos/UnittestProto3.cs
sharp/src/Google.Protobuf.Test/TestProtos/UnittestWellKnownTypes.cs
sharp/src/Google.Protobuf.Test/WellKnownTypes/AnyTest.cs
sharp/src/Google.Protobuf.Test/WellKnownTypes/DurationTest.cs
sharp/src/Google.Protobuf.Test/WellKnownTypes/FieldMaskTest.cs
sharp/src/Google.Protobuf.Test/WellKnownTypes/TimestampTest.cs
sharp/src/Google.Protobuf.Test/WellKnownTypes/WrappersTest.cs
sharp/src/Google.Protobuf.Test/packages.config
sharp/src/Google.Protobuf.sln
sharp/src/Google.Protobuf/ByteArray.cs
sharp/src/Google.Protobuf/ByteString.cs
sharp/src/Google.Protobuf/CodedInputStream.cs
sharp/src/Google.Protobuf/CodedOutputStream.ComputeSize.cs
sharp/src/Google.Protobuf/CodedOutputStream.cs
sharp/src/Google.Protobuf/Collections/MapField.cs
sharp/src/Google.Protobuf/Collections/ReadOnlyDictionary.cs
sharp/src/Google.Protobuf/Collections/RepeatedField.cs
sharp/src/Google.Protobuf/Compatibility/PropertyInfoExtensions.cs
sharp/src/Google.Protobuf/Compatibility/TypeExtensions.cs
sharp/src/Google.Protobuf/FieldCodec.cs
sharp/src/Google.Protobuf/FrameworkPortability.cs
sharp/src/Google.Protobuf/Google.Protobuf.csproj
sharp/src/Google.Protobuf/Google.Protobuf.nuspec
sharp/src/Google.Protobuf/ICustomDiagnosticMessage.cs
sharp/src/Google.Protobuf/IDeepCloneable.cs
sharp/src/Google.Protobuf/IMessage.cs
sharp/src/Google.Protobuf/InvalidJsonException.cs
sharp/src/Google.Protobuf/InvalidProtocolBufferException.cs
sharp/src/Google.Protobuf/JsonFormatter.cs
sharp/src/Google.Protobuf/JsonParser.cs
sharp/src/Google.Protobuf/JsonToken.cs
sharp/src/Google.Protobuf/JsonTokenizer.cs
sharp/src/Google.Protobuf/LimitedInputStream.cs
sharp/src/Google.Protobuf/MessageExtensions.cs
sharp/src/Google.Protobuf/MessageParser.cs
sharp/src/Google.Protobuf/Properties/AssemblyInfo.cs
sharp/src/Google.Protobuf/ProtoPreconditions.cs
sharp/src/Google.Protobuf/Reflection/Descriptor.cs
sharp/src/Google.Protobuf/Reflection/DescriptorBase.cs
sharp/src/Google.Protobuf/Reflection/DescriptorPool.cs
sharp/src/Google.Protobuf/Reflection/DescriptorUtil.cs
sharp/src/Google.Protobuf/Reflection/DescriptorValidationException.cs
sharp/src/Google.Protobuf/Reflection/EnumDescriptor.cs
sharp/src/Google.Protobuf/Reflection/EnumValueDescriptor.cs
sharp/src/Google.Protobuf/Reflection/FieldAccessorBase.cs
sharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs
sharp/src/Google.Protobuf/Reflection/FieldType.cs
sharp/src/Google.Protobuf/Reflection/FileDescriptor.cs
sharp/src/Google.Protobuf/Reflection/GeneratedClrTypeInfo.cs
sharp/src/Google.Protobuf/Reflection/IDescriptor.cs
sharp/src/Google.Protobuf/Reflection/IFieldAccessor.cs
sharp/src/Google.Protobuf/Reflection/MapFieldAccessor.cs
sharp/src/Google.Protobuf/Reflection/MessageDescriptor.cs
sharp/src/Google.Protobuf/Reflection/MethodDescriptor.cs
sharp/src/Google.Protobuf/Reflection/OneofAccessor.cs
sharp/src/Google.Protobuf/Reflection/OneofDescriptor.cs
sharp/src/Google.Protobuf/Reflection/OriginalNameAttribute.cs
sharp/src/Google.Protobuf/Reflection/PackageDescriptor.cs
sharp/src/Google.Protobuf/Reflection/PartialClasses.cs
sharp/src/Google.Protobuf/Reflection/ReflectionUtil.cs
sharp/src/Google.Protobuf/Reflection/RepeatedFieldAccessor.cs
sharp/src/Google.Protobuf/Reflection/ServiceDescriptor.cs
sharp/src/Google.Protobuf/Reflection/SingleFieldAccessor.cs
sharp/src/Google.Protobuf/Reflection/TypeRegistry.cs
sharp/src/Google.Protobuf/WellKnownTypes/Any.cs
sharp/src/Google.Protobuf/WellKnownTypes/AnyPartial.cs
sharp/src/Google.Protobuf/WellKnownTypes/Api.cs
sharp/src/Google.Protobuf/WellKnownTypes/Duration.cs
sharp/src/Google.Protobuf/WellKnownTypes/DurationPartial.cs
sharp/src/Google.Protobuf/WellKnownTypes/Empty.cs
sharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs
sharp/src/Google.Protobuf/WellKnownTypes/FieldMaskPartial.cs
sharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs
sharp/src/Google.Protobuf/WellKnownTypes/Struct.cs
sharp/src/Google.Protobuf/WellKnownTypes/TimeExtensions.cs
sharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs
sharp/src/Google.Protobuf/WellKnownTypes/TimestampPartial.cs
sharp/src/Google.Protobuf/WellKnownTypes/Type.cs
sharp/src/Google.Protobuf/WellKnownTypes/ValuePartial.cs
sharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs
sharp/src/Google.Protobuf/WellKnownTypes/WrappersPartial.cs
sharp/src/Google.Protobuf/WireFormat.cs
sharp/src/Google.Protobuf/packages.config
sharp/src/packages/repositories.config
ocs/swift/DesignDoc.md
ocs/third_party.md
ditors/proto.vim
ditors/protobuf-mode.el
xamples/AddPerson.java
xamples/ListPeople.java
xamples/Makefile
xamples/README.txt
xamples/add_person.cc
xamples/add_person.go
xamples/add_person.py
xamples/add_person_test.go
xamples/addressbook.proto
xamples/list_people.cc
xamples/list_people.go
xamples/list_people.py
xamples/list_people_test.go
enerate_descriptor_proto.sh
mock.BUILD
ava/README.md
ava/README.txt
ava/core/generate-sources-build.xml
ava/core/generate-test-sources-build.xml
ava/core/pom.xml
ava/core/src/main/java/com/google/protobuf/AbstractMessage.java
ava/core/src/main/java/com/google/protobuf/AbstractMessageLite.java
ava/core/src/main/java/com/google/protobuf/AbstractParser.java
ava/core/src/main/java/com/google/protobuf/AbstractProtobufList.java
ava/core/src/main/java/com/google/protobuf/BlockingRpcChannel.java
ava/core/src/main/java/com/google/protobuf/BlockingService.java
ava/core/src/main/java/com/google/protobuf/BooleanArrayList.java
ava/core/src/main/java/com/google/protobuf/ByteBufferWriter.java
ava/core/src/main/java/com/google/protobuf/ByteOutput.java
ava/core/src/main/java/com/google/protobuf/ByteString.java
ava/core/src/main/java/com/google/protobuf/CodedInputStream.java
ava/core/src/main/java/com/google/protobuf/CodedOutputStream.java
ava/core/src/main/java/com/google/protobuf/Descriptors.java
ava/core/src/main/java/com/google/protobuf/DoubleArrayList.java
ava/core/src/main/java/com/google/protobuf/DynamicMessage.java
ava/core/src/main/java/com/google/protobuf/ExperimentalApi.java
ava/core/src/main/java/com/google/protobuf/Extension.java
ava/core/src/main/java/com/google/protobuf/ExtensionLite.java
ava/core/src/main/java/com/google/protobuf/ExtensionRegistry.java
ava/core/src/main/java/com/google/protobuf/ExtensionRegistryLite.java
ava/core/src/main/java/com/google/protobuf/FieldSet.java
ava/core/src/main/java/com/google/protobuf/FloatArrayList.java
ava/core/src/main/java/com/google/protobuf/GeneratedMessage.java
ava/core/src/main/java/com/google/protobuf/GeneratedMessageLite.java
ava/core/src/main/java/com/google/protobuf/IntArrayList.java
ava/core/src/main/java/com/google/protobuf/Internal.java
ava/core/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java
ava/core/src/main/java/com/google/protobuf/LazyField.java
ava/core/src/main/java/com/google/protobuf/LazyFieldLite.java
ava/core/src/main/java/com/google/protobuf/LazyStringArrayList.java
ava/core/src/main/java/com/google/protobuf/LazyStringList.java
ava/core/src/main/java/com/google/protobuf/LongArrayList.java
ava/core/src/main/java/com/google/protobuf/MapEntry.java
ava/core/src/main/java/com/google/protobuf/MapEntryLite.java
ava/core/src/main/java/com/google/protobuf/MapField.java
ava/core/src/main/java/com/google/protobuf/MapFieldLite.java
ava/core/src/main/java/com/google/protobuf/Message.java
ava/core/src/main/java/com/google/protobuf/MessageLite.java
ava/core/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java
ava/core/src/main/java/com/google/protobuf/MessageLiteToString.java
ava/core/src/main/java/com/google/protobuf/MessageOrBuilder.java
ava/core/src/main/java/com/google/protobuf/MessageReflection.java
ava/core/src/main/java/com/google/protobuf/MutabilityOracle.java
ava/core/src/main/java/com/google/protobuf/NioByteString.java
ava/core/src/main/java/com/google/protobuf/Parser.java
ava/core/src/main/java/com/google/protobuf/ProtobufArrayList.java
ava/core/src/main/java/com/google/protobuf/ProtocolMessageEnum.java
ava/core/src/main/java/com/google/protobuf/ProtocolStringList.java
ava/core/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java
ava/core/src/main/java/com/google/protobuf/RopeByteString.java
ava/core/src/main/java/com/google/protobuf/RpcCallback.java
ava/core/src/main/java/com/google/protobuf/RpcChannel.java
ava/core/src/main/java/com/google/protobuf/RpcController.java
ava/core/src/main/java/com/google/protobuf/RpcUtil.java
ava/core/src/main/java/com/google/protobuf/Service.java
ava/core/src/main/java/com/google/protobuf/ServiceException.java
ava/core/src/main/java/com/google/protobuf/SingleFieldBuilder.java
ava/core/src/main/java/com/google/protobuf/SmallSortedMap.java
ava/core/src/main/java/com/google/protobuf/TextFormat.java
ava/core/src/main/java/com/google/protobuf/TextFormatEscaper.java
ava/core/src/main/java/com/google/protobuf/TextFormatParseInfoTree.java
ava/core/src/main/java/com/google/protobuf/TextFormatParseLocation.java
ava/core/src/main/java/com/google/protobuf/UninitializedMessageException.java
ava/core/src/main/java/com/google/protobuf/UnknownFieldSet.java
ava/core/src/main/java/com/google/protobuf/UnknownFieldSetLite.java
ava/core/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java
ava/core/src/main/java/com/google/protobuf/UnsafeByteOperations.java
ava/core/src/main/java/com/google/protobuf/Utf8.java
ava/core/src/main/java/com/google/protobuf/WireFormat.java
ava/core/src/test/java/com/google/protobuf/AbstractMessageTest.java
ava/core/src/test/java/com/google/protobuf/AnyTest.java
ava/core/src/test/java/com/google/protobuf/BooleanArrayListTest.java
ava/core/src/test/java/com/google/protobuf/BoundedByteStringTest.java
ava/core/src/test/java/com/google/protobuf/ByteBufferWriterTest.java
ava/core/src/test/java/com/google/protobuf/ByteStringTest.java
ava/core/src/test/java/com/google/protobuf/CheckUtf8Test.java
ava/core/src/test/java/com/google/protobuf/CodedInputStreamTest.java
ava/core/src/test/java/com/google/protobuf/CodedOutputStreamTest.java
ava/core/src/test/java/com/google/protobuf/DeprecatedFieldTest.java
ava/core/src/test/java/com/google/protobuf/DescriptorsTest.java
ava/core/src/test/java/com/google/protobuf/DoubleArrayListTest.java
ava/core/src/test/java/com/google/protobuf/DynamicMessageTest.java
ava/core/src/test/java/com/google/protobuf/EnumTest.java
ava/core/src/test/java/com/google/protobuf/FieldPresenceTest.java
ava/core/src/test/java/com/google/protobuf/FloatArrayListTest.java
ava/core/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java
ava/core/src/test/java/com/google/protobuf/GeneratedMessageTest.java
ava/core/src/test/java/com/google/protobuf/IntArrayListTest.java
ava/core/src/test/java/com/google/protobuf/IsValidUtf8Test.java
ava/core/src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java
ava/core/src/test/java/com/google/protobuf/LazyFieldLiteTest.java
ava/core/src/test/java/com/google/protobuf/LazyFieldTest.java
ava/core/src/test/java/com/google/protobuf/LazyMessageLiteTest.java
ava/core/src/test/java/com/google/protobuf/LazyStringArrayListTest.java
ava/core/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java
ava/core/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java
ava/core/src/test/java/com/google/protobuf/LiteTest.java
ava/core/src/test/java/com/google/protobuf/LiteralByteStringTest.java
ava/core/src/test/java/com/google/protobuf/LongArrayListTest.java
ava/core/src/test/java/com/google/protobuf/MapForProto2LiteTest.java
ava/core/src/test/java/com/google/protobuf/MapForProto2Test.java
ava/core/src/test/java/com/google/protobuf/MapTest.java
ava/core/src/test/java/com/google/protobuf/MessageTest.java
ava/core/src/test/java/com/google/protobuf/NestedBuildersTest.java
ava/core/src/test/java/com/google/protobuf/NioByteStringTest.java
ava/core/src/test/java/com/google/protobuf/ParseExceptionsTest.java
ava/core/src/test/java/com/google/protobuf/ParserTest.java
ava/core/src/test/java/com/google/protobuf/ProtobufArrayListTest.java
ava/core/src/test/java/com/google/protobuf/RepeatedFieldBuilderTest.java
ava/core/src/test/java/com/google/protobuf/RopeByteStringSubstringTest.java
ava/core/src/test/java/com/google/protobuf/RopeByteStringTest.java
ava/core/src/test/java/com/google/protobuf/ServiceTest.java
ava/core/src/test/java/com/google/protobuf/SingleFieldBuilderTest.java
ava/core/src/test/java/com/google/protobuf/SmallSortedMapTest.java
ava/core/src/test/java/com/google/protobuf/TestBadIdentifiers.java
ava/core/src/test/java/com/google/protobuf/TestUtil.java
ava/core/src/test/java/com/google/protobuf/TestUtilLite.java
ava/core/src/test/java/com/google/protobuf/TextFormatParseInfoTreeTest.java
ava/core/src/test/java/com/google/protobuf/TextFormatParseLocationTest.java
ava/core/src/test/java/com/google/protobuf/TextFormatTest.java
ava/core/src/test/java/com/google/protobuf/UnknownEnumValueTest.java
ava/core/src/test/java/com/google/protobuf/UnknownFieldSetLiteTest.java
ava/core/src/test/java/com/google/protobuf/UnknownFieldSetTest.java
ava/core/src/test/java/com/google/protobuf/UnmodifiableLazyStringListTest.java
ava/core/src/test/java/com/google/protobuf/WellKnownTypesTest.java
ava/core/src/test/java/com/google/protobuf/WireFormatTest.java
ava/core/src/test/proto/com/google/protobuf/any_test.proto
ava/core/src/test/proto/com/google/protobuf/field_presence_test.proto
ava/core/src/test/proto/com/google/protobuf/lazy_fields_lite.proto
ava/core/src/test/proto/com/google/protobuf/lite_equals_and_hash.proto
ava/core/src/test/proto/com/google/protobuf/map_for_proto2_lite_test.proto
ava/core/src/test/proto/com/google/protobuf/map_for_proto2_test.proto
ava/core/src/test/proto/com/google/protobuf/map_initialization_order_test.proto
ava/core/src/test/proto/com/google/protobuf/map_test.proto
ava/core/src/test/proto/com/google/protobuf/multiple_files_test.proto
ava/core/src/test/proto/com/google/protobuf/nested_builders_test.proto
ava/core/src/test/proto/com/google/protobuf/nested_extension.proto
ava/core/src/test/proto/com/google/protobuf/nested_extension_lite.proto
ava/core/src/test/proto/com/google/protobuf/non_nested_extension.proto
ava/core/src/test/proto/com/google/protobuf/non_nested_extension_lite.proto
ava/core/src/test/proto/com/google/protobuf/outer_class_name_test.proto
ava/core/src/test/proto/com/google/protobuf/outer_class_name_test2.proto
ava/core/src/test/proto/com/google/protobuf/outer_class_name_test3.proto
ava/core/src/test/proto/com/google/protobuf/test_bad_identifiers.proto
ava/core/src/test/proto/com/google/protobuf/test_check_utf8.proto
ava/core/src/test/proto/com/google/protobuf/test_check_utf8_size.proto
ava/core/src/test/proto/com/google/protobuf/test_custom_options.proto
ava/core/src/test/proto/com/google/protobuf/test_extra_interfaces.proto
ava/lite/generate-sources-build.xml
ava/lite/generate-test-sources-build.xml
ava/lite/pom.xml
ava/pom.xml
ava/src/device/main/java/com/google/protobuf/nano/android/ParcelableExtendableMessageNano.java
ava/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNano.java
ava/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNanoCreator.java
ava/src/device/test/AndroidManifest.xml
ava/src/device/test/java/com/google/protobuf/nano/NanoAndroidTest.java
ava/src/main/java/com/google/protobuf/AbstractMessage.java
ava/src/main/java/com/google/protobuf/AbstractMessageLite.java
ava/src/main/java/com/google/protobuf/AbstractParser.java
ava/src/main/java/com/google/protobuf/BlockingRpcChannel.java
ava/src/main/java/com/google/protobuf/BlockingService.java
ava/src/main/java/com/google/protobuf/BoundedByteString.java
ava/src/main/java/com/google/protobuf/ByteString.java
ava/src/main/java/com/google/protobuf/CodedInputStream.java
ava/src/main/java/com/google/protobuf/CodedOutputStream.java
ava/src/main/java/com/google/protobuf/Descriptors.java
ava/src/main/java/com/google/protobuf/DynamicMessage.java
ava/src/main/java/com/google/protobuf/Extension.java
ava/src/main/java/com/google/protobuf/ExtensionRegistry.java
ava/src/main/java/com/google/protobuf/ExtensionRegistryLite.java
ava/src/main/java/com/google/protobuf/FieldSet.java
ava/src/main/java/com/google/protobuf/GeneratedMessage.java
ava/src/main/java/com/google/protobuf/GeneratedMessageLite.java
ava/src/main/java/com/google/protobuf/Internal.java
ava/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java
ava/src/main/java/com/google/protobuf/LazyField.java
ava/src/main/java/com/google/protobuf/LazyFieldLite.java
ava/src/main/java/com/google/protobuf/LazyStringArrayList.java
ava/src/main/java/com/google/protobuf/LazyStringList.java
ava/src/main/java/com/google/protobuf/LiteralByteString.java
ava/src/main/java/com/google/protobuf/Message.java
ava/src/main/java/com/google/protobuf/MessageLite.java
ava/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java
ava/src/main/java/com/google/protobuf/MessageOrBuilder.java
ava/src/main/java/com/google/protobuf/MessageReflection.java
ava/src/main/java/com/google/protobuf/Parser.java
ava/src/main/java/com/google/protobuf/ProtocolMessageEnum.java
ava/src/main/java/com/google/protobuf/ProtocolStringList.java
ava/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java
ava/src/main/java/com/google/protobuf/RopeByteString.java
ava/src/main/java/com/google/protobuf/RpcCallback.java
ava/src/main/java/com/google/protobuf/RpcChannel.java
ava/src/main/java/com/google/protobuf/RpcController.java
ava/src/main/java/com/google/protobuf/RpcUtil.java
ava/src/main/java/com/google/protobuf/Service.java
ava/src/main/java/com/google/protobuf/ServiceException.java
ava/src/main/java/com/google/protobuf/SingleFieldBuilder.java
ava/src/main/java/com/google/protobuf/SmallSortedMap.java
ava/src/main/java/com/google/protobuf/TextFormat.java
ava/src/main/java/com/google/protobuf/UninitializedMessageException.java
ava/src/main/java/com/google/protobuf/UnknownFieldSet.java
ava/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java
ava/src/main/java/com/google/protobuf/Utf8.java
ava/src/main/java/com/google/protobuf/WireFormat.java
ava/src/main/java/com/google/protobuf/micro/ByteStringMicro.java
ava/src/main/java/com/google/protobuf/micro/CodedInputStreamMicro.java
ava/src/main/java/com/google/protobuf/micro/CodedOutputStreamMicro.java
ava/src/main/java/com/google/protobuf/micro/InvalidProtocolBufferMicroException.java
ava/src/main/java/com/google/protobuf/micro/MessageMicro.java
ava/src/main/java/com/google/protobuf/micro/WireFormatMicro.java
ava/src/main/java/com/google/protobuf/nano/CodedInputByteBufferNano.java
ava/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java
ava/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
ava/src/main/java/com/google/protobuf/nano/Extension.java
ava/src/main/java/com/google/protobuf/nano/FieldArray.java
ava/src/main/java/com/google/protobuf/nano/FieldData.java
ava/src/main/java/com/google/protobuf/nano/InternalNano.java
ava/src/main/java/com/google/protobuf/nano/InvalidProtocolBufferNanoException.java
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
ava/src/main/java/com/google/protobuf/nano/UnknownFieldData.java
ava/src/main/java/com/google/protobuf/nano/WireFormatNano.java
ava/src/test/java/com/google/protobuf/AbstractMessageTest.java
ava/src/test/java/com/google/protobuf/BoundedByteStringTest.java
ava/src/test/java/com/google/protobuf/ByteStringTest.java
ava/src/test/java/com/google/protobuf/CheckUtf8Test.java
ava/src/test/java/com/google/protobuf/CodedInputStreamTest.java
ava/src/test/java/com/google/protobuf/CodedOutputStreamTest.java
ava/src/test/java/com/google/protobuf/DeprecatedFieldTest.java
ava/src/test/java/com/google/protobuf/DescriptorsTest.java
ava/src/test/java/com/google/protobuf/DynamicMessageTest.java
ava/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java
ava/src/test/java/com/google/protobuf/GeneratedMessageTest.java
ava/src/test/java/com/google/protobuf/IsValidUtf8Test.java
ava/src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java
ava/src/test/java/com/google/protobuf/LazyFieldLiteTest.java
ava/src/test/java/com/google/protobuf/LazyFieldTest.java
ava/src/test/java/com/google/protobuf/LazyMessageLiteTest.java
ava/src/test/java/com/google/protobuf/LazyStringArrayListTest.java
ava/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java
ava/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java
ava/src/test/java/com/google/protobuf/LiteTest.java
ava/src/test/java/com/google/protobuf/LiteralByteStringTest.java
ava/src/test/java/com/google/protobuf/MessageTest.java
ava/src/test/java/com/google/protobuf/MicroTest.java
ava/src/test/java/com/google/protobuf/NanoTest.java
ava/src/test/java/com/google/protobuf/NestedBuildersTest.java
ava/src/test/java/com/google/protobuf/ParserTest.java
ava/src/test/java/com/google/protobuf/RepeatedFieldBuilderTest.java
ava/src/test/java/com/google/protobuf/RopeByteStringSubstringTest.java
ava/src/test/java/com/google/protobuf/RopeByteStringTest.java
ava/src/test/java/com/google/protobuf/ServiceTest.java
ava/src/test/java/com/google/protobuf/SingleFieldBuilderTest.java
ava/src/test/java/com/google/protobuf/SmallSortedMapTest.java
ava/src/test/java/com/google/protobuf/TestBadIdentifiers.java
ava/src/test/java/com/google/protobuf/TestUtil.java
ava/src/test/java/com/google/protobuf/TextFormatTest.java
ava/src/test/java/com/google/protobuf/UnknownFieldSetTest.java
ava/src/test/java/com/google/protobuf/UnmodifiableLazyStringListTest.java
ava/src/test/java/com/google/protobuf/WireFormatTest.java
ava/src/test/java/com/google/protobuf/lazy_fields_lite.proto
ava/src/test/java/com/google/protobuf/lite_equals_and_hash.proto
ava/src/test/java/com/google/protobuf/multiple_files_test.proto
ava/src/test/java/com/google/protobuf/nested_builders_test.proto
ava/src/test/java/com/google/protobuf/nested_extension.proto
ava/src/test/java/com/google/protobuf/nested_extension_lite.proto
ava/src/test/java/com/google/protobuf/non_nested_extension.proto
ava/src/test/java/com/google/protobuf/non_nested_extension_lite.proto
ava/src/test/java/com/google/protobuf/outer_class_name_test.proto
ava/src/test/java/com/google/protobuf/outer_class_name_test2.proto
ava/src/test/java/com/google/protobuf/outer_class_name_test3.proto
ava/src/test/java/com/google/protobuf/test_bad_identifiers.proto
ava/src/test/java/com/google/protobuf/test_check_utf8.proto
ava/src/test/java/com/google/protobuf/test_check_utf8_size.proto
ava/src/test/java/com/google/protobuf/test_custom_options.proto
ava/src/test/java/com/google/protobuf/test_extra_interfaces.proto
ava/util/pom.xml
ava/util/src/main/java/com/google/protobuf/util/FieldMaskTree.java
ava/util/src/main/java/com/google/protobuf/util/FieldMaskUtil.java
ava/util/src/main/java/com/google/protobuf/util/JsonFormat.java
ava/util/src/main/java/com/google/protobuf/util/TimeUtil.java
ava/util/src/test/java/com/google/protobuf/util/FieldMaskTreeTest.java
ava/util/src/test/java/com/google/protobuf/util/FieldMaskUtilTest.java
ava/util/src/test/java/com/google/protobuf/util/JsonFormatTest.java
ava/util/src/test/java/com/google/protobuf/util/TimeUtilTest.java
ava/util/src/test/proto/com/google/protobuf/util/json_test.proto
avamicro/src/main/java/com/google/protobuf/micro/ByteStringMicro.java
avamicro/src/main/java/com/google/protobuf/micro/CodedInputStreamMicro.java
avamicro/src/main/java/com/google/protobuf/micro/CodedOutputStreamMicro.java
avamicro/src/main/java/com/google/protobuf/micro/InvalidProtocolBufferMicroException.java
avamicro/src/main/java/com/google/protobuf/micro/MessageMicro.java
avamicro/src/main/java/com/google/protobuf/micro/WireFormatMicro.java
avanano/README.md
avanano/pom.xml
avanano/src/device/main/java/com/google/protobuf/nano/android/ParcelableExtendableMessageNano.java
avanano/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNano.java
avanano/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNanoCreator.java
avanano/src/device/test/AndroidManifest.xml
avanano/src/device/test/java/com/google/protobuf/nano/NanoAndroidTest.java
avanano/src/main/java/com/google/protobuf/nano/CodedInputByteBufferNano.java
avanano/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java
avanano/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
avanano/src/main/java/com/google/protobuf/nano/Extension.java
avanano/src/main/java/com/google/protobuf/nano/FieldArray.java
avanano/src/main/java/com/google/protobuf/nano/FieldData.java
avanano/src/main/java/com/google/protobuf/nano/InternalNano.java
avanano/src/main/java/com/google/protobuf/nano/InvalidProtocolBufferNanoException.java
avanano/src/main/java/com/google/protobuf/nano/MapFactories.java
avanano/src/main/java/com/google/protobuf/nano/MessageNano.java
avanano/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
avanano/src/main/java/com/google/protobuf/nano/UnknownFieldData.java
avanano/src/main/java/com/google/protobuf/nano/WireFormatNano.java
avanano/src/test/java/com/google/protobuf/nano/NanoTest.java
avanano/src/test/java/com/google/protobuf/nano/map_test.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_accessors_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_enum_class_multiple_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_enum_class_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_enum_validity_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_extension_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_extension_packed_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_extension_repeated_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_extension_singular_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_has_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_import_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nameclash_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_recursive_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_reference_types_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_repeated_merge_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_repeated_packables_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_simple_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_single_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_stringutf8_nano.proto
enkins/README.md
enkins/build_and_run_docker.sh
enkins/buildcmds/README.md
enkins/buildcmds/pull_request.sh
enkins/docker/Dockerfile
enkins/make_test_output.py
enkins/pull_request_in_docker.sh
s/README.md
s/binary/arith.js
s/binary/arith_test.js
s/binary/constants.js
s/binary/decoder.js
s/binary/decoder_test.js
s/binary/encoder.js
s/binary/proto_test.js
s/binary/reader.js
s/binary/reader_test.js
s/binary/utils.js
s/binary/utils_test.js
s/binary/writer.js
s/binary/writer_test.js
s/commonjs/export.js
s/commonjs/export_asserts.js
s/commonjs/export_testdeps.js
s/commonjs/import_test.js
s/commonjs/jasmine.json
s/commonjs/rewrite_tests_for_commonjs.js
s/commonjs/test6/test6.proto
s/commonjs/test7/test7.proto
s/data.proto
s/debug.js
s/debug_test.js
s/gulpfile.js
s/jasmine.json
s/message.js
s/message_test.js
s/node_loader.js
s/package.json
s/proto3_test.js
s/proto3_test.proto
s/test.proto
s/test2.proto
s/test3.proto
s/test4.proto
s/test5.proto
s/test_bootstrap.js
s/testbinary.proto
s/testempty.proto
4/acx_check_suncc.m4
4/libtool.m4
4/ltoptions.m4
4/ltsugar.m4
4/ltversion.m4
4/lt~obsolete.m4
4/stl_hash.m4
bjectivec/DevTools/check_version_stamps.sh
bjectivec/DevTools/compile_testing_protos.sh
bjectivec/DevTools/full_mac_build.sh
bjectivec/DevTools/pddm.py
bjectivec/DevTools/pddm_tests.py
bjectivec/GPBArray.h
bjectivec/GPBArray.m
bjectivec/GPBArray_PackagePrivate.h
bjectivec/GPBBootstrap.h
bjectivec/GPBCodedInputStream.h
bjectivec/GPBCodedInputStream.m
bjectivec/GPBCodedInputStream_PackagePrivate.h
bjectivec/GPBCodedOutputStream.h
bjectivec/GPBCodedOutputStream.m
bjectivec/GPBCodedOutputStream_PackagePrivate.h
bjectivec/GPBDescriptor.h
bjectivec/GPBDescriptor.m
bjectivec/GPBDescriptor_PackagePrivate.h
bjectivec/GPBDictionary.h
bjectivec/GPBDictionary.m
bjectivec/GPBDictionary_PackagePrivate.h
bjectivec/GPBExtensionInternals.h
bjectivec/GPBExtensionInternals.m
bjectivec/GPBExtensionRegistry.h
bjectivec/GPBExtensionRegistry.m
bjectivec/GPBMessage.h
bjectivec/GPBMessage.m
bjectivec/GPBMessage_PackagePrivate.h
bjectivec/GPBProtocolBuffers.h
bjectivec/GPBProtocolBuffers.m
bjectivec/GPBProtocolBuffers_RuntimeSupport.h
bjectivec/GPBRootObject.h
bjectivec/GPBRootObject.m
bjectivec/GPBRootObject_PackagePrivate.h
bjectivec/GPBRuntimeTypes.h
bjectivec/GPBUnknownField.h
bjectivec/GPBUnknownField.m
bjectivec/GPBUnknownFieldSet.h
bjectivec/GPBUnknownFieldSet.m
bjectivec/GPBUnknownFieldSet_PackagePrivate.h
bjectivec/GPBUnknownField_PackagePrivate.h
bjectivec/GPBUtilities.h
bjectivec/GPBUtilities.m
bjectivec/GPBUtilities_PackagePrivate.h
bjectivec/GPBWellKnownTypes.h
bjectivec/GPBWellKnownTypes.m
bjectivec/GPBWireFormat.h
bjectivec/GPBWireFormat.m
bjectivec/ProtocolBuffers_OSX.xcodeproj/project.pbxproj
bjectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/contents.xcworkspacedata
bjectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
bjectivec/ProtocolBuffers_OSX.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme
bjectivec/ProtocolBuffers_OSX.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme
bjectivec/ProtocolBuffers_iOS.xcodeproj/project.pbxproj
bjectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata
bjectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
bjectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcbaselines/8BBEA4A5147C727100C4ADB7.xcbaseline/FFE465CA-0E74-40E8-9F09-500B66B7DCB2.plist
bjectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcbaselines/8BBEA4A5147C727100C4ADB7.xcbaseline/Info.plist
bjectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme
bjectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme
bjectivec/README.md
bjectivec/Tests/GPBARCUnittestProtos.m
bjectivec/Tests/GPBArrayTests.m
bjectivec/Tests/GPBCodedInputStreamTests.m
bjectivec/Tests/GPBCodedOuputStreamTests.m
bjectivec/Tests/GPBConcurrencyTests.m
bjectivec/Tests/GPBDescriptorTests.m
bjectivec/Tests/GPBDictionaryTests+Bool.m
bjectivec/Tests/GPBDictionaryTests+Int32.m
bjectivec/Tests/GPBDictionaryTests+Int64.m
bjectivec/Tests/GPBDictionaryTests+String.m
bjectivec/Tests/GPBDictionaryTests+UInt32.m
bjectivec/Tests/GPBDictionaryTests+UInt64.m
bjectivec/Tests/GPBDictionaryTests.pddm
bjectivec/Tests/GPBMessageTests+Merge.m
bjectivec/Tests/GPBMessageTests+Runtime.m
bjectivec/Tests/GPBMessageTests+Serialization.m
bjectivec/Tests/GPBMessageTests.m
bjectivec/Tests/GPBObjectiveCPlusPlusTest.mm
bjectivec/Tests/GPBPerfTests.m
bjectivec/Tests/GPBSwiftTests.swift
bjectivec/Tests/GPBTestUtilities.h
bjectivec/Tests/GPBTestUtilities.m
bjectivec/Tests/GPBUnittestProtos.m
bjectivec/Tests/GPBUnknownFieldSetTest.m
bjectivec/Tests/GPBUtilitiesTests.m
bjectivec/Tests/GPBWellKnownTypesTest.m
bjectivec/Tests/GPBWireFormatTests.m
bjectivec/Tests/UnitTests-Bridging-Header.h
bjectivec/Tests/UnitTests-Info.plist
bjectivec/Tests/golden_message
bjectivec/Tests/golden_packed_fields_message
bjectivec/Tests/iOSTestHarness/AppDelegate.m
bjectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/Contents.json
bjectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad6.png
bjectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad6_2x.png
bjectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad7.png
bjectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad7_2x.png
bjectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone6.png
bjectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone6_2x.png
bjectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7_2x.png
bjectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7_3x.png
bjectivec/Tests/iOSTestHarness/Images.xcassets/LaunchImage.launchimage/Contents.json
bjectivec/Tests/iOSTestHarness/Info.plist
bjectivec/Tests/iOSTestHarness/LaunchScreen.xib
bjectivec/Tests/iOSTestHarness/en.lproj/InfoPlist.strings
bjectivec/Tests/text_format_map_unittest_data.txt
bjectivec/Tests/text_format_unittest_data.txt
bjectivec/Tests/unittest_cycle.proto
bjectivec/Tests/unittest_objc.proto
bjectivec/Tests/unittest_objc_startup.proto
bjectivec/Tests/unittest_runtime_proto2.proto
bjectivec/Tests/unittest_runtime_proto3.proto
bjectivec/generate_well_known_types.sh
bjectivec/google/protobuf/Any.pbobjc.h
bjectivec/google/protobuf/Any.pbobjc.m
bjectivec/google/protobuf/Api.pbobjc.h
bjectivec/google/protobuf/Api.pbobjc.m
bjectivec/google/protobuf/Duration.pbobjc.h
bjectivec/google/protobuf/Duration.pbobjc.m
bjectivec/google/protobuf/Empty.pbobjc.h
bjectivec/google/protobuf/Empty.pbobjc.m
bjectivec/google/protobuf/FieldMask.pbobjc.h
bjectivec/google/protobuf/FieldMask.pbobjc.m
bjectivec/google/protobuf/SourceContext.pbobjc.h
bjectivec/google/protobuf/SourceContext.pbobjc.m
bjectivec/google/protobuf/Struct.pbobjc.h
bjectivec/google/protobuf/Struct.pbobjc.m
bjectivec/google/protobuf/Timestamp.pbobjc.h
bjectivec/google/protobuf/Timestamp.pbobjc.m
bjectivec/google/protobuf/Type.pbobjc.h
bjectivec/google/protobuf/Type.pbobjc.m
bjectivec/google/protobuf/Wrappers.pbobjc.h
bjectivec/google/protobuf/Wrappers.pbobjc.m
hp/ext/google/protobuf/config.m4
hp/ext/google/protobuf/def.c
hp/ext/google/protobuf/message.c
hp/ext/google/protobuf/protobuf.c
hp/ext/google/protobuf/protobuf.h
hp/ext/google/protobuf/storage.c
hp/ext/google/protobuf/test.php
hp/ext/google/protobuf/upb.c
hp/ext/google/protobuf/upb.h
hp/tests/autoload.php
ost_process_dist.sh
rotobuf-lite.pc.in
rotobuf.bzl
rotobuf.pc.in
rotoc-artifacts/Dockerfile
rotoc-artifacts/README.md
rotoc-artifacts/build-protoc.sh
rotoc-artifacts/pom.xml
ython/MANIFEST.in
ython/README.md
ython/README.txt
ython/ez_setup.py
ython/google/__init__.py
ython/google/protobuf/__init__.py
ython/google/protobuf/descriptor.py
ython/google/protobuf/descriptor_database.py
ython/google/protobuf/descriptor_pool.py
ython/google/protobuf/internal/_parameterized.py
ython/google/protobuf/internal/any_test.proto
ython/google/protobuf/internal/api_implementation.cc
ython/google/protobuf/internal/api_implementation.py
ython/google/protobuf/internal/api_implementation_default_test.py
ython/google/protobuf/internal/containers.py
ython/google/protobuf/internal/cpp_message.py
ython/google/protobuf/internal/decoder.py
ython/google/protobuf/internal/descriptor_database_test.py
ython/google/protobuf/internal/descriptor_pool_test.py
ython/google/protobuf/internal/descriptor_pool_test1.proto
ython/google/protobuf/internal/descriptor_pool_test2.proto
ython/google/protobuf/internal/descriptor_python_test.py
ython/google/protobuf/internal/descriptor_test.py
ython/google/protobuf/internal/encoder.py
ython/google/protobuf/internal/factory_test1.proto
ython/google/protobuf/internal/factory_test2.proto
ython/google/protobuf/internal/generator_test.py
ython/google/protobuf/internal/import_test_package/__init__.py
ython/google/protobuf/internal/import_test_package/inner.proto
ython/google/protobuf/internal/import_test_package/outer.proto
ython/google/protobuf/internal/json_format_test.py
ython/google/protobuf/internal/message_factory_python_test.py
ython/google/protobuf/internal/message_factory_test.py
ython/google/protobuf/internal/message_python_test.py
ython/google/protobuf/internal/message_set_extensions.proto
ython/google/protobuf/internal/message_test.py
ython/google/protobuf/internal/missing_enum_values.proto
ython/google/protobuf/internal/more_extensions.proto
ython/google/protobuf/internal/more_extensions_dynamic.proto
ython/google/protobuf/internal/more_messages.proto
ython/google/protobuf/internal/packed_field_test.proto
ython/google/protobuf/internal/proto_builder_test.py
ython/google/protobuf/internal/python_message.py
ython/google/protobuf/internal/reflection_test.py
ython/google/protobuf/internal/service_reflection_test.py
ython/google/protobuf/internal/symbol_database_test.py
ython/google/protobuf/internal/test_bad_identifiers.proto
ython/google/protobuf/internal/test_util.py
ython/google/protobuf/internal/text_encoding_test.py
ython/google/protobuf/internal/text_format_test.py
ython/google/protobuf/internal/type_checkers.py
ython/google/protobuf/internal/unknown_fields_test.py
ython/google/protobuf/internal/well_known_types.py
ython/google/protobuf/internal/well_known_types_test.py
ython/google/protobuf/internal/wire_format_test.py
ython/google/protobuf/json_format.py
ython/google/protobuf/message.py
ython/google/protobuf/message_factory.py
ython/google/protobuf/proto_builder.py
ython/google/protobuf/pyext/__init__.py
ython/google/protobuf/pyext/cpp_message.py
ython/google/protobuf/pyext/descriptor.cc
ython/google/protobuf/pyext/descriptor.h
ython/google/protobuf/pyext/descriptor_containers.cc
ython/google/protobuf/pyext/descriptor_containers.h
ython/google/protobuf/pyext/descriptor_cpp2_test.py
ython/google/protobuf/pyext/descriptor_database.cc
ython/google/protobuf/pyext/descriptor_database.h
ython/google/protobuf/pyext/descriptor_pool.cc
ython/google/protobuf/pyext/descriptor_pool.h
ython/google/protobuf/pyext/extension_dict.cc
ython/google/protobuf/pyext/extension_dict.h
ython/google/protobuf/pyext/map_container.cc
ython/google/protobuf/pyext/map_container.h
ython/google/protobuf/pyext/message.cc
ython/google/protobuf/pyext/message.h
ython/google/protobuf/pyext/message_factory_cpp2_test.py
ython/google/protobuf/pyext/proto2_api_test.proto
ython/google/protobuf/pyext/python.proto
ython/google/protobuf/pyext/reflection_cpp2_generated_test.py
ython/google/protobuf/pyext/repeated_composite_container.cc
ython/google/protobuf/pyext/repeated_composite_container.h
ython/google/protobuf/pyext/repeated_scalar_container.cc
ython/google/protobuf/pyext/repeated_scalar_container.h
ython/google/protobuf/pyext/scoped_pyobject_ptr.h
ython/google/protobuf/reflection.py
ython/google/protobuf/symbol_database.py
ython/google/protobuf/text_encoding.py
ython/google/protobuf/text_format.py
ython/mox.py
ython/setup.py
ython/tox.ini
uby/.gitignore
uby/Gemfile
uby/Gemfile.lock
uby/README.md
uby/Rakefile
uby/ext/google/protobuf_c/defs.c
uby/ext/google/protobuf_c/encode_decode.c
uby/ext/google/protobuf_c/extconf.rb
uby/ext/google/protobuf_c/map.c
uby/ext/google/protobuf_c/message.c
uby/ext/google/protobuf_c/protobuf.c
uby/ext/google/protobuf_c/protobuf.h
uby/ext/google/protobuf_c/repeated_field.c
uby/ext/google/protobuf_c/storage.c
uby/ext/google/protobuf_c/upb.c
uby/ext/google/protobuf_c/upb.h
uby/google-protobuf.gemspec
uby/lib/google/protobuf.rb
uby/lib/google/protobuf/message_exts.rb
uby/lib/google/protobuf/repeated_field.rb
uby/pom.xml
uby/src/main/java/com/google/protobuf/jruby/RubyBuilder.java
uby/src/main/java/com/google/protobuf/jruby/RubyDescriptor.java
uby/src/main/java/com/google/protobuf/jruby/RubyDescriptorPool.java
uby/src/main/java/com/google/protobuf/jruby/RubyEnum.java
uby/src/main/java/com/google/protobuf/jruby/RubyEnumBuilderContext.java
uby/src/main/java/com/google/protobuf/jruby/RubyEnumDescriptor.java
uby/src/main/java/com/google/protobuf/jruby/RubyFieldDescriptor.java
uby/src/main/java/com/google/protobuf/jruby/RubyMap.java
uby/src/main/java/com/google/protobuf/jruby/RubyMessage.java
uby/src/main/java/com/google/protobuf/jruby/RubyMessageBuilderContext.java
uby/src/main/java/com/google/protobuf/jruby/RubyOneofBuilderContext.java
uby/src/main/java/com/google/protobuf/jruby/RubyOneofDescriptor.java
uby/src/main/java/com/google/protobuf/jruby/RubyProtobuf.java
uby/src/main/java/com/google/protobuf/jruby/RubyRepeatedField.java
uby/src/main/java/com/google/protobuf/jruby/SentinelOuterClass.java
uby/src/main/java/com/google/protobuf/jruby/Utils.java
uby/src/main/java/google/ProtobufJavaService.java
uby/src/main/sentinel.proto
uby/tests/basic.rb
uby/tests/generated_code.proto
uby/tests/generated_code_test.rb
uby/tests/repeated_field_test.rb
uby/tests/stress.rb
uby/travis-test.sh
ix.BUILD
rc/Makefile.am
rc/Makefile.in
rc/README.md
rc/google/protobuf/SEBS
rc/google/protobuf/any.cc
rc/google/protobuf/any.h
rc/google/protobuf/any.pb.cc
rc/google/protobuf/any.pb.h
rc/google/protobuf/any.proto
rc/google/protobuf/any_test.cc
rc/google/protobuf/any_test.proto
rc/google/protobuf/api.pb.cc
rc/google/protobuf/api.pb.h
rc/google/protobuf/api.proto
rc/google/protobuf/arena.cc
rc/google/protobuf/arena.h
rc/google/protobuf/arena_nc.cc
rc/google/protobuf/arena_nc_test.py
rc/google/protobuf/arena_test_util.cc
rc/google/protobuf/arena_test_util.h
rc/google/protobuf/arena_unittest.cc
rc/google/protobuf/arenastring.cc
rc/google/protobuf/arenastring.h
rc/google/protobuf/arenastring_unittest.cc
rc/google/protobuf/compiler/code_generator.cc
rc/google/protobuf/compiler/code_generator.h
rc/google/protobuf/compiler/command_line_interface.cc
rc/google/protobuf/compiler/command_line_interface.h
rc/google/protobuf/compiler/command_line_interface_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_enum.cc
rc/google/protobuf/compiler/cpp/cpp_enum.h
rc/google/protobuf/compiler/cpp/cpp_enum_field.cc
rc/google/protobuf/compiler/cpp/cpp_enum_field.h
rc/google/protobuf/compiler/cpp/cpp_extension.cc
rc/google/protobuf/compiler/cpp/cpp_extension.h
rc/google/protobuf/compiler/cpp/cpp_field.cc
rc/google/protobuf/compiler/cpp/cpp_field.h
rc/google/protobuf/compiler/cpp/cpp_file.cc
rc/google/protobuf/compiler/cpp/cpp_file.h
rc/google/protobuf/compiler/cpp/cpp_generator.cc
rc/google/protobuf/compiler/cpp/cpp_helpers.cc
rc/google/protobuf/compiler/cpp/cpp_helpers.h
rc/google/protobuf/compiler/cpp/cpp_map_field.cc
rc/google/protobuf/compiler/cpp/cpp_map_field.h
rc/google/protobuf/compiler/cpp/cpp_message.cc
rc/google/protobuf/compiler/cpp/cpp_message.h
rc/google/protobuf/compiler/cpp/cpp_message_field.cc
rc/google/protobuf/compiler/cpp/cpp_message_field.h
rc/google/protobuf/compiler/cpp/cpp_options.h
rc/google/protobuf/compiler/cpp/cpp_plugin_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_primitive_field.cc
rc/google/protobuf/compiler/cpp/cpp_primitive_field.h
rc/google/protobuf/compiler/cpp/cpp_service.cc
rc/google/protobuf/compiler/cpp/cpp_string_field.cc
rc/google/protobuf/compiler/cpp/cpp_string_field.h
rc/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto
rc/google/protobuf/compiler/cpp/cpp_test_large_enum_value.proto
rc/google/protobuf/compiler/cpp/cpp_unittest.cc
rc/google/protobuf/compiler/cpp/metadata_test.cc
rc/google/protobuf/compiler/csharp/csharp_doc_comment.cc
rc/google/protobuf/compiler/csharp/csharp_doc_comment.h
rc/google/protobuf/compiler/csharp/csharp_enum.cc
rc/google/protobuf/compiler/csharp/csharp_enum.h
rc/google/protobuf/compiler/csharp/csharp_enum_field.cc
rc/google/protobuf/compiler/csharp/csharp_enum_field.h
rc/google/protobuf/compiler/csharp/csharp_field_base.cc
rc/google/protobuf/compiler/csharp/csharp_field_base.h
rc/google/protobuf/compiler/csharp/csharp_generator.cc
rc/google/protobuf/compiler/csharp/csharp_generator.h
rc/google/protobuf/compiler/csharp/csharp_generator_unittest.cc
rc/google/protobuf/compiler/csharp/csharp_helpers.cc
rc/google/protobuf/compiler/csharp/csharp_helpers.h
rc/google/protobuf/compiler/csharp/csharp_map_field.cc
rc/google/protobuf/compiler/csharp/csharp_map_field.h
rc/google/protobuf/compiler/csharp/csharp_message.cc
rc/google/protobuf/compiler/csharp/csharp_message.h
rc/google/protobuf/compiler/csharp/csharp_message_field.cc
rc/google/protobuf/compiler/csharp/csharp_message_field.h
rc/google/protobuf/compiler/csharp/csharp_names.h
rc/google/protobuf/compiler/csharp/csharp_options.h
rc/google/protobuf/compiler/csharp/csharp_primitive_field.cc
rc/google/protobuf/compiler/csharp/csharp_primitive_field.h
rc/google/protobuf/compiler/csharp/csharp_reflection_class.cc
rc/google/protobuf/compiler/csharp/csharp_reflection_class.h
rc/google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc
rc/google/protobuf/compiler/csharp/csharp_repeated_enum_field.h
rc/google/protobuf/compiler/csharp/csharp_repeated_message_field.cc
rc/google/protobuf/compiler/csharp/csharp_repeated_message_field.h
rc/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc
rc/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.h
rc/google/protobuf/compiler/csharp/csharp_source_generator_base.cc
rc/google/protobuf/compiler/csharp/csharp_source_generator_base.h
rc/google/protobuf/compiler/csharp/csharp_wrapper_field.cc
rc/google/protobuf/compiler/csharp/csharp_wrapper_field.h
rc/google/protobuf/compiler/importer.cc
rc/google/protobuf/compiler/importer.h
rc/google/protobuf/compiler/importer_unittest.cc
rc/google/protobuf/compiler/java/java_context.cc
rc/google/protobuf/compiler/java/java_context.h
rc/google/protobuf/compiler/java/java_doc_comment.cc
rc/google/protobuf/compiler/java/java_enum.cc
rc/google/protobuf/compiler/java/java_enum_field.cc
rc/google/protobuf/compiler/java/java_enum_field.h
rc/google/protobuf/compiler/java/java_enum_field_lite.cc
rc/google/protobuf/compiler/java/java_enum_field_lite.h
rc/google/protobuf/compiler/java/java_enum_lite.cc
rc/google/protobuf/compiler/java/java_enum_lite.h
rc/google/protobuf/compiler/java/java_extension.cc
rc/google/protobuf/compiler/java/java_extension.h
rc/google/protobuf/compiler/java/java_extension_lite.cc
rc/google/protobuf/compiler/java/java_extension_lite.h
rc/google/protobuf/compiler/java/java_field.cc
rc/google/protobuf/compiler/java/java_field.h
rc/google/protobuf/compiler/java/java_file.cc
rc/google/protobuf/compiler/java/java_file.h
rc/google/protobuf/compiler/java/java_generator.cc
rc/google/protobuf/compiler/java/java_generator_factory.cc
rc/google/protobuf/compiler/java/java_helpers.cc
rc/google/protobuf/compiler/java/java_helpers.h
rc/google/protobuf/compiler/java/java_lazy_message_field.cc
rc/google/protobuf/compiler/java/java_lazy_message_field_lite.cc
rc/google/protobuf/compiler/java/java_lazy_message_field_lite.h
rc/google/protobuf/compiler/java/java_map_field.cc
rc/google/protobuf/compiler/java/java_map_field.h
rc/google/protobuf/compiler/java/java_map_field_lite.cc
rc/google/protobuf/compiler/java/java_map_field_lite.h
rc/google/protobuf/compiler/java/java_message.cc
rc/google/protobuf/compiler/java/java_message.h
rc/google/protobuf/compiler/java/java_message_builder.cc
rc/google/protobuf/compiler/java/java_message_builder.h
rc/google/protobuf/compiler/java/java_message_builder_lite.cc
rc/google/protobuf/compiler/java/java_message_builder_lite.h
rc/google/protobuf/compiler/java/java_message_field.cc
rc/google/protobuf/compiler/java/java_message_field_lite.cc
rc/google/protobuf/compiler/java/java_message_field_lite.h
rc/google/protobuf/compiler/java/java_message_lite.cc
rc/google/protobuf/compiler/java/java_message_lite.h
rc/google/protobuf/compiler/java/java_name_resolver.cc
rc/google/protobuf/compiler/java/java_name_resolver.h
rc/google/protobuf/compiler/java/java_names.h
rc/google/protobuf/compiler/java/java_plugin_unittest.cc
rc/google/protobuf/compiler/java/java_primitive_field.cc
rc/google/protobuf/compiler/java/java_primitive_field_lite.cc
rc/google/protobuf/compiler/java/java_primitive_field_lite.h
rc/google/protobuf/compiler/java/java_service.cc
rc/google/protobuf/compiler/java/java_shared_code_generator.cc
rc/google/protobuf/compiler/java/java_shared_code_generator.h
rc/google/protobuf/compiler/java/java_string_field.cc
rc/google/protobuf/compiler/java/java_string_field.h
rc/google/protobuf/compiler/java/java_string_field_lite.cc
rc/google/protobuf/compiler/java/java_string_field_lite.h
rc/google/protobuf/compiler/javanano/javanano_enum.h
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_enum_field.h
rc/google/protobuf/compiler/javanano/javanano_extension.h
rc/google/protobuf/compiler/javanano/javanano_field.cc
rc/google/protobuf/compiler/javanano/javanano_field.h
rc/google/protobuf/compiler/javanano/javanano_file.cc
rc/google/protobuf/compiler/javanano/javanano_file.h
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_generator.h
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.h
rc/google/protobuf/compiler/javanano/javanano_map_field.cc
rc/google/protobuf/compiler/javanano/javanano_map_field.h
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_message.h
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.h
rc/google/protobuf/compiler/javanano/javanano_params.h
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.h
rc/google/protobuf/compiler/js/js_generator.cc
rc/google/protobuf/compiler/js/js_generator.h
rc/google/protobuf/compiler/main.cc
rc/google/protobuf/compiler/mock_code_generator.cc
rc/google/protobuf/compiler/mock_code_generator.h
rc/google/protobuf/compiler/objectivec/objectivec_enum.cc
rc/google/protobuf/compiler/objectivec/objectivec_enum.h
rc/google/protobuf/compiler/objectivec/objectivec_enum_field.cc
rc/google/protobuf/compiler/objectivec/objectivec_enum_field.h
rc/google/protobuf/compiler/objectivec/objectivec_extension.cc
rc/google/protobuf/compiler/objectivec/objectivec_extension.h
rc/google/protobuf/compiler/objectivec/objectivec_field.cc
rc/google/protobuf/compiler/objectivec/objectivec_field.h
rc/google/protobuf/compiler/objectivec/objectivec_file.cc
rc/google/protobuf/compiler/objectivec/objectivec_file.h
rc/google/protobuf/compiler/objectivec/objectivec_generator.cc
rc/google/protobuf/compiler/objectivec/objectivec_generator.h
rc/google/protobuf/compiler/objectivec/objectivec_helpers.cc
rc/google/protobuf/compiler/objectivec/objectivec_helpers.h
rc/google/protobuf/compiler/objectivec/objectivec_helpers_unittest.cc
rc/google/protobuf/compiler/objectivec/objectivec_map_field.cc
rc/google/protobuf/compiler/objectivec/objectivec_map_field.h
rc/google/protobuf/compiler/objectivec/objectivec_message.cc
rc/google/protobuf/compiler/objectivec/objectivec_message.h
rc/google/protobuf/compiler/objectivec/objectivec_message_field.cc
rc/google/protobuf/compiler/objectivec/objectivec_message_field.h
rc/google/protobuf/compiler/objectivec/objectivec_oneof.cc
rc/google/protobuf/compiler/objectivec/objectivec_oneof.h
rc/google/protobuf/compiler/objectivec/objectivec_primitive_field.cc
rc/google/protobuf/compiler/objectivec/objectivec_primitive_field.h
rc/google/protobuf/compiler/parser.cc
rc/google/protobuf/compiler/parser.h
rc/google/protobuf/compiler/parser_unittest.cc
rc/google/protobuf/compiler/plugin.cc
rc/google/protobuf/compiler/plugin.h
rc/google/protobuf/compiler/plugin.pb.cc
rc/google/protobuf/compiler/plugin.pb.h
rc/google/protobuf/compiler/plugin.proto
rc/google/protobuf/compiler/python/python_generator.cc
rc/google/protobuf/compiler/python/python_generator.h
rc/google/protobuf/compiler/python/python_plugin_unittest.cc
rc/google/protobuf/compiler/ruby/ruby_generated_code.proto
rc/google/protobuf/compiler/ruby/ruby_generated_code.rb
rc/google/protobuf/compiler/ruby/ruby_generator.cc
rc/google/protobuf/compiler/ruby/ruby_generator.h
rc/google/protobuf/compiler/ruby/ruby_generator_unittest.cc
rc/google/protobuf/compiler/subprocess.cc
rc/google/protobuf/descriptor.cc
rc/google/protobuf/descriptor.h
rc/google/protobuf/descriptor.pb.cc
rc/google/protobuf/descriptor.pb.h
rc/google/protobuf/descriptor.proto
rc/google/protobuf/descriptor_database.cc
rc/google/protobuf/descriptor_database.h
rc/google/protobuf/descriptor_database_unittest.cc
rc/google/protobuf/descriptor_pb2_test.py
rc/google/protobuf/descriptor_unittest.cc
rc/google/protobuf/drop_unknown_fields_test.cc
rc/google/protobuf/duration.pb.cc
rc/google/protobuf/duration.pb.h
rc/google/protobuf/duration.proto
rc/google/protobuf/dynamic_message.cc
rc/google/protobuf/dynamic_message.h
rc/google/protobuf/dynamic_message_unittest.cc
rc/google/protobuf/empty.pb.cc
rc/google/protobuf/empty.pb.h
rc/google/protobuf/empty.proto
rc/google/protobuf/extension_set.cc
rc/google/protobuf/extension_set.h
rc/google/protobuf/extension_set_heavy.cc
rc/google/protobuf/extension_set_unittest.cc
rc/google/protobuf/field_mask.pb.cc
rc/google/protobuf/field_mask.pb.h
rc/google/protobuf/field_mask.proto
rc/google/protobuf/generated_enum_reflection.h
rc/google/protobuf/generated_enum_util.h
rc/google/protobuf/generated_message_reflection.cc
rc/google/protobuf/generated_message_reflection.h
rc/google/protobuf/generated_message_reflection_unittest.cc
rc/google/protobuf/generated_message_util.cc
rc/google/protobuf/generated_message_util.h
rc/google/protobuf/io/coded_stream.cc
rc/google/protobuf/io/coded_stream.h
rc/google/protobuf/io/coded_stream_inl.h
rc/google/protobuf/io/coded_stream_unittest.cc
rc/google/protobuf/io/gzip_stream.cc
rc/google/protobuf/io/gzip_stream.h
rc/google/protobuf/io/printer.cc
rc/google/protobuf/io/printer.h
rc/google/protobuf/io/printer_unittest.cc
rc/google/protobuf/io/strtod.cc
rc/google/protobuf/io/strtod.h
rc/google/protobuf/io/tokenizer.cc
rc/google/protobuf/io/tokenizer.h
rc/google/protobuf/io/tokenizer_unittest.cc
rc/google/protobuf/io/zero_copy_stream.cc
rc/google/protobuf/io/zero_copy_stream_impl.cc
rc/google/protobuf/io/zero_copy_stream_impl_lite.cc
rc/google/protobuf/io/zero_copy_stream_impl_lite.h
rc/google/protobuf/io/zero_copy_stream_unittest.cc
rc/google/protobuf/lite_arena_unittest.cc
rc/google/protobuf/lite_unittest.cc
rc/google/protobuf/map.h
rc/google/protobuf/map_entry.h
rc/google/protobuf/map_entry_lite.h
rc/google/protobuf/map_field.cc
rc/google/protobuf/map_field.h
rc/google/protobuf/map_field_inl.h
rc/google/protobuf/map_field_lite.h
rc/google/protobuf/map_field_test.cc
rc/google/protobuf/map_lite_test_util.cc
rc/google/protobuf/map_lite_test_util.h
rc/google/protobuf/map_lite_unittest.proto
rc/google/protobuf/map_proto2_unittest.proto
rc/google/protobuf/map_test.cc
rc/google/protobuf/map_test_util.cc
rc/google/protobuf/map_test_util.h
rc/google/protobuf/map_test_util_impl.h
rc/google/protobuf/map_type_handler.h
rc/google/protobuf/map_unittest.proto
rc/google/protobuf/map_unittest_proto3.proto
rc/google/protobuf/message.cc
rc/google/protobuf/message.h
rc/google/protobuf/message_lite.cc
rc/google/protobuf/message_lite.h
rc/google/protobuf/message_unittest.cc
rc/google/protobuf/metadata.h
rc/google/protobuf/no_field_presence_test.cc
rc/google/protobuf/preserve_unknown_enum_test.cc
rc/google/protobuf/proto3_arena_lite_unittest.cc
rc/google/protobuf/proto3_arena_unittest.cc
rc/google/protobuf/proto3_lite_unittest.cc
rc/google/protobuf/reflection.h
rc/google/protobuf/reflection_internal.h
rc/google/protobuf/reflection_ops_unittest.cc
rc/google/protobuf/repeated_field.cc
rc/google/protobuf/repeated_field.h
rc/google/protobuf/repeated_field_reflection.h
rc/google/protobuf/repeated_field_reflection_unittest.cc
rc/google/protobuf/repeated_field_unittest.cc
rc/google/protobuf/service.h
rc/google/protobuf/source_context.pb.cc
rc/google/protobuf/source_context.pb.h
rc/google/protobuf/source_context.proto
rc/google/protobuf/struct.pb.cc
rc/google/protobuf/struct.pb.h
rc/google/protobuf/struct.proto
rc/google/protobuf/stubs/atomic_sequence_num.h
rc/google/protobuf/stubs/atomicops.h
rc/google/protobuf/stubs/atomicops_internals_generic_gcc.h
rc/google/protobuf/stubs/atomicops_internals_mips_gcc.h
rc/google/protobuf/stubs/atomicops_internals_pnacl.h
rc/google/protobuf/stubs/atomicops_internals_power.h
rc/google/protobuf/stubs/atomicops_internals_ppc_gcc.h
rc/google/protobuf/stubs/bytestream.cc
rc/google/protobuf/stubs/bytestream.h
rc/google/protobuf/stubs/bytestream_unittest.cc
rc/google/protobuf/stubs/callback.h
rc/google/protobuf/stubs/casts.h
rc/google/protobuf/stubs/common.cc
rc/google/protobuf/stubs/common.h
rc/google/protobuf/stubs/common_unittest.cc
rc/google/protobuf/stubs/fastmem.h
rc/google/protobuf/stubs/hash.cc
rc/google/protobuf/stubs/hash.h
rc/google/protobuf/stubs/int128.cc
rc/google/protobuf/stubs/int128.h
rc/google/protobuf/stubs/int128_unittest.cc
rc/google/protobuf/stubs/logging.h
rc/google/protobuf/stubs/macros.h
rc/google/protobuf/stubs/map-util.h
rc/google/protobuf/stubs/map_util.h
rc/google/protobuf/stubs/mathlimits.cc
rc/google/protobuf/stubs/mathlimits.h
rc/google/protobuf/stubs/mathutil.h
rc/google/protobuf/stubs/mutex.h
rc/google/protobuf/stubs/once.h
rc/google/protobuf/stubs/once_unittest.cc
rc/google/protobuf/stubs/platform_macros.h
rc/google/protobuf/stubs/port.h
rc/google/protobuf/stubs/scoped_ptr.h
rc/google/protobuf/stubs/shared_ptr.h
rc/google/protobuf/stubs/singleton.h
rc/google/protobuf/stubs/status.cc
rc/google/protobuf/stubs/status.h
rc/google/protobuf/stubs/status_macros.h
rc/google/protobuf/stubs/status_test.cc
rc/google/protobuf/stubs/statusor.cc
rc/google/protobuf/stubs/statusor.h
rc/google/protobuf/stubs/statusor_test.cc
rc/google/protobuf/stubs/stl_util-inl.h
rc/google/protobuf/stubs/stringpiece.cc
rc/google/protobuf/stubs/stringpiece.h
rc/google/protobuf/stubs/stringpiece_unittest.cc
rc/google/protobuf/stubs/stringprintf.cc
rc/google/protobuf/stubs/structurally_valid.cc
rc/google/protobuf/stubs/strutil.cc
rc/google/protobuf/stubs/strutil.h
rc/google/protobuf/stubs/strutil_unittest.cc
rc/google/protobuf/stubs/template_util.h
rc/google/protobuf/stubs/time.cc
rc/google/protobuf/stubs/time.h
rc/google/protobuf/stubs/time_test.cc
rc/google/protobuf/stubs/type_traits.h
rc/google/protobuf/stubs/type_traits_unittest.cc
rc/google/protobuf/test_util.cc
rc/google/protobuf/test_util.h
rc/google/protobuf/test_util_lite.cc
rc/google/protobuf/test_util_lite.h
rc/google/protobuf/testdata/golden_message_proto3
rc/google/protobuf/testdata/map_test_data.txt
rc/google/protobuf/testing/file.cc
rc/google/protobuf/testing/file.h
rc/google/protobuf/testing/googletest.cc
rc/google/protobuf/testing/zcgunzip.cc
rc/google/protobuf/testing/zcgzip.cc
rc/google/protobuf/text_format.cc
rc/google/protobuf/text_format.h
rc/google/protobuf/text_format_unittest.cc
rc/google/protobuf/timestamp.pb.cc
rc/google/protobuf/timestamp.pb.h
rc/google/protobuf/timestamp.proto
rc/google/protobuf/type.pb.cc
rc/google/protobuf/type.pb.h
rc/google/protobuf/type.proto
rc/google/protobuf/unittest.proto
rc/google/protobuf/unittest_accessors_nano.proto
rc/google/protobuf/unittest_arena.proto
rc/google/protobuf/unittest_bytes_offset_length_nano.proto
rc/google/protobuf/unittest_custom_options.proto
rc/google/protobuf/unittest_drop_unknown_fields.proto
rc/google/protobuf/unittest_embed_optimize_for.proto
rc/google/protobuf/unittest_empty.proto
rc/google/protobuf/unittest_enormous_descriptor.proto
rc/google/protobuf/unittest_enum_class_multiple_nano.proto
rc/google/protobuf/unittest_enum_class_nano.proto
rc/google/protobuf/unittest_enum_validity_nano.proto
rc/google/protobuf/unittest_extension_nano.proto
rc/google/protobuf/unittest_extension_packed_nano.proto
rc/google/protobuf/unittest_extension_repeated_nano.proto
rc/google/protobuf/unittest_extension_singular_nano.proto
rc/google/protobuf/unittest_has_nano.proto
rc/google/protobuf/unittest_import.proto
rc/google/protobuf/unittest_import_lite.proto
rc/google/protobuf/unittest_import_micro.proto
rc/google/protobuf/unittest_import_nano.proto
rc/google/protobuf/unittest_import_proto3.proto
rc/google/protobuf/unittest_import_public.proto
rc/google/protobuf/unittest_import_public_lite.proto
rc/google/protobuf/unittest_import_public_proto3.proto
rc/google/protobuf/unittest_lite.proto
rc/google/protobuf/unittest_lite_imports_nonlite.proto
rc/google/protobuf/unittest_micro.proto
rc/google/protobuf/unittest_mset.proto
rc/google/protobuf/unittest_mset_wire_format.proto
rc/google/protobuf/unittest_multiple_micro.proto
rc/google/protobuf/unittest_multiple_nameclash_micro.proto
rc/google/protobuf/unittest_multiple_nameclash_nano.proto
rc/google/protobuf/unittest_multiple_nano.proto
rc/google/protobuf/unittest_nano.proto
rc/google/protobuf/unittest_no_arena.proto
rc/google/protobuf/unittest_no_arena_import.proto
rc/google/protobuf/unittest_no_arena_lite.proto
rc/google/protobuf/unittest_no_field_presence.proto
rc/google/protobuf/unittest_no_generic_services.proto
rc/google/protobuf/unittest_optimize_for.proto
rc/google/protobuf/unittest_preserve_unknown_enum.proto
rc/google/protobuf/unittest_preserve_unknown_enum2.proto
rc/google/protobuf/unittest_proto3.proto
rc/google/protobuf/unittest_proto3_arena.proto
rc/google/protobuf/unittest_proto3_arena_lite.proto
rc/google/protobuf/unittest_proto3_lite.proto
rc/google/protobuf/unittest_recursive_micro.proto
rc/google/protobuf/unittest_recursive_nano.proto
rc/google/protobuf/unittest_reference_types_nano.proto
rc/google/protobuf/unittest_repeated_merge_nano.proto
rc/google/protobuf/unittest_repeated_packables_nano.proto
rc/google/protobuf/unittest_simple_micro.proto
rc/google/protobuf/unittest_simple_nano.proto
rc/google/protobuf/unittest_single_micro.proto
rc/google/protobuf/unittest_single_nano.proto
rc/google/protobuf/unittest_stringutf8_micro.proto
rc/google/protobuf/unittest_stringutf8_nano.proto
rc/google/protobuf/unittest_unknown_enum_values_nano.proto
rc/google/protobuf/unittest_well_known_types.proto
rc/google/protobuf/unknown_field_set.cc
rc/google/protobuf/unknown_field_set.h
rc/google/protobuf/unknown_field_set_unittest.cc
rc/google/protobuf/util/field_comparator.cc
rc/google/protobuf/util/field_comparator.h
rc/google/protobuf/util/field_comparator_test.cc
rc/google/protobuf/util/field_mask_util.cc
rc/google/protobuf/util/field_mask_util.h
rc/google/protobuf/util/field_mask_util_test.cc
rc/google/protobuf/util/internal/constants.h
rc/google/protobuf/util/internal/datapiece.cc
rc/google/protobuf/util/internal/datapiece.h
rc/google/protobuf/util/internal/default_value_objectwriter.cc
rc/google/protobuf/util/internal/default_value_objectwriter.h
rc/google/protobuf/util/internal/default_value_objectwriter_test.cc
rc/google/protobuf/util/internal/error_listener.cc
rc/google/protobuf/util/internal/error_listener.h
rc/google/protobuf/util/internal/expecting_objectwriter.h
rc/google/protobuf/util/internal/field_mask_utility.cc
rc/google/protobuf/util/internal/field_mask_utility.h
rc/google/protobuf/util/internal/json_escaping.cc
rc/google/protobuf/util/internal/json_escaping.h
rc/google/protobuf/util/internal/json_objectwriter.cc
rc/google/protobuf/util/internal/json_objectwriter.h
rc/google/protobuf/util/internal/json_objectwriter_test.cc
rc/google/protobuf/util/internal/json_stream_parser.cc
rc/google/protobuf/util/internal/json_stream_parser.h
rc/google/protobuf/util/internal/json_stream_parser_test.cc
rc/google/protobuf/util/internal/location_tracker.h
rc/google/protobuf/util/internal/mock_error_listener.h
rc/google/protobuf/util/internal/object_location_tracker.h
rc/google/protobuf/util/internal/object_source.h
rc/google/protobuf/util/internal/object_writer.cc
rc/google/protobuf/util/internal/object_writer.h
rc/google/protobuf/util/internal/proto_writer.cc
rc/google/protobuf/util/internal/proto_writer.h
rc/google/protobuf/util/internal/protostream_objectsource.cc
rc/google/protobuf/util/internal/protostream_objectsource.h
rc/google/protobuf/util/internal/protostream_objectsource_test.cc
rc/google/protobuf/util/internal/protostream_objectwriter.cc
rc/google/protobuf/util/internal/protostream_objectwriter.h
rc/google/protobuf/util/internal/protostream_objectwriter_test.cc
rc/google/protobuf/util/internal/structured_objectwriter.h
rc/google/protobuf/util/internal/testdata/anys.proto
rc/google/protobuf/util/internal/testdata/books.proto
rc/google/protobuf/util/internal/testdata/default_value.proto
rc/google/protobuf/util/internal/testdata/default_value_test.proto
rc/google/protobuf/util/internal/testdata/field_mask.proto
rc/google/protobuf/util/internal/testdata/maps.proto
rc/google/protobuf/util/internal/testdata/oneofs.proto
rc/google/protobuf/util/internal/testdata/struct.proto
rc/google/protobuf/util/internal/testdata/timestamp_duration.proto
rc/google/protobuf/util/internal/testdata/wrappers.proto
rc/google/protobuf/util/internal/type_info.cc
rc/google/protobuf/util/internal/type_info.h
rc/google/protobuf/util/internal/type_info_test_helper.cc
rc/google/protobuf/util/internal/type_info_test_helper.h
rc/google/protobuf/util/internal/utility.cc
rc/google/protobuf/util/internal/utility.h
rc/google/protobuf/util/json_format_proto3.proto
rc/google/protobuf/util/json_util.cc
rc/google/protobuf/util/json_util.h
rc/google/protobuf/util/json_util_test.cc
rc/google/protobuf/util/message_differencer.cc
rc/google/protobuf/util/message_differencer.h
rc/google/protobuf/util/message_differencer_unittest.cc
rc/google/protobuf/util/message_differencer_unittest.proto
rc/google/protobuf/util/time_util.cc
rc/google/protobuf/util/time_util.h
rc/google/protobuf/util/time_util_test.cc
rc/google/protobuf/util/type_resolver.h
rc/google/protobuf/util/type_resolver_util.cc
rc/google/protobuf/util/type_resolver_util.h
rc/google/protobuf/util/type_resolver_util_test.cc
rc/google/protobuf/well_known_types_unittest.cc
rc/google/protobuf/wire_format.cc
rc/google/protobuf/wire_format.h
rc/google/protobuf/wire_format_lite.cc
rc/google/protobuf/wire_format_lite.h
rc/google/protobuf/wire_format_lite_inl.h
rc/google/protobuf/wire_format_unittest.cc
rc/google/protobuf/wrappers.pb.cc
rc/google/protobuf/wrappers.pb.h
rc/google/protobuf/wrappers.proto
ests.sh
pdate_file_lists.sh
til/BUILD
til/CHANGES.txt
til/CONTRIBUTORS.txt
til/LICENSE
til/Makefile.am
til/Protobuf.podspec
til/README.md
til/WORKSPACE
til/appveyor.bat
til/appveyor.yml
til/autogen.sh
til/configure.ac
til/generate_descriptor_proto.sh
til/gmock.BUILD
til/post_process_dist.sh
til/protobuf-lite.pc.in
til/protobuf.bzl
til/protobuf.pc.in
til/python/BUILD
til/six.BUILD
til/tests.sh
til/update_file_lists.sh
sprojects/config.h
sprojects/convert2008to2005.sh
sprojects/extract_includes.bat
sprojects/libprotobuf-lite.vcproj
sprojects/libprotobuf.vcproj
sprojects/libprotoc.vcproj
sprojects/lite-test.vcproj
sprojects/protobuf.sln
sprojects/protoc.vcproj
sprojects/readme.txt
sprojects/test_plugin.vcproj
sprojects/tests.vcproj
21a20ad7bd239b9120a5426f4a793bc9c213558f 08-Mar-2016 Jeff Davidson <jpd@google.com> Parse unknown enum values like full proto2.

Store unknown values in the unknown field set. For repeated fields,
store unknown values while leaving known values in place.

This can lead to some strange behaviors, such as new values not being
serialized (because the unknown field set copy comes second on the
wire), or the order of repeated fields changing (if the value is
serialized when the field is unknown, and deserialized later when it
becomes known). Having strange behavior be consistent with the
standard implementation is nonetheless better than diverging.

Bug: 26337187
Change-Id: I9fee24d05d387a46e15b07c7a8a97704b76b5f27
avanano/pom.xml
avanano/src/test/java/com/google/protobuf/nano/NanoTest.java
avanano/src/test/java/com/google/protobuf/nano/unittest_unknown_enum_values.proto
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
137226a921d0f50c9e8a9f3ae43a3459b48d18a1 08-May-2015 Jeff Davidson <jpd@google.com> Add a flag to use offset/length with byte arrays.

This is an advanced option that most users won't want/need. However,
it can greatly optimize flows where we want to reuse byte[] buffers
from other locations without having to first copy the contents into
a new array of the exact correct size.

Bug: 20636336
Change-Id: Ia8d0af82e952858f9571f84110da621da776619c
avanano/pom.xml
avanano/src/main/java/com/google/protobuf/nano/CodedInputByteBufferNano.java
avanano/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java
avanano/src/test/java/com/google/protobuf/nano/NanoTest.java
avanano/src/test/java/com/google/protobuf/nano/unittest_bytes_offset_length_nano.proto
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_params.h
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.h
99498c68b476186599af77d620f19d4123b0ff8b 10-Nov-2016 Tamas Berghammer <tberghammer@google.com> Fix the Gradle build file after the proto3 update

Change-Id: Id57a19b706cedb441bcb1e84c679978e8ea0ccf6
uild.gradle
4a59877e585c1c86704e722c173e631ef3a69e49 09-Nov-2016 Tamas Berghammer <tberghammer@google.com> Merge "Merge remote-tracking branch 'goog/protobuf3' into 'goog/master'"
bda916c42b4fd3d235d0c49d249f03c34de77558 26-Sep-2016 Tamas Berghammer <tberghammer@google.com> Merge remote-tracking branch 'goog/protobuf3' into 'goog/master'

This merge updates protobuf from v2.6.1 to v3.0.0-beta3.

Local modifications compared to upstream done during the merge:
* Updated list of C++/Java sources in Android.mk
* Register the Android specific java micro compiler
* Migrate android specific tests to new package names
* Automatically detect RTTI from compiler defined macros
* Fix build when compiled with stlport

Bug: b/28974522
Change-Id: I76344103ff2fa60951aa3ab3103b1bfa03742e71
960c2b5bc9f7e4016f5654a368719d41a7e7ac97 04-Oct-2016 Joe Onorato <joeo@google.com> Build libprotoc - for making plugins to protoc.

Test: make libprotoc
Change-Id: Iec3df53973f303651dbece87d7b42de6f9a7a0e8
ndroid.bp
onfig/config.h
f9d6dcdae6bcbbcb4635f5377a82fd1a5ec17632 07-Sep-2016 Chih-hung Hsieh <chh@google.com> Merge "Emit macros with proper parentheses." am: 7d33a02d15 am: a27e302c46 am: 09de6a61c5
am: 26c830a601

Change-Id: I9fe6bef3484fe7bcf0a5fbf69327e09f743788d3
26c830a601a4be274c27401f2656b4faa0316b92 06-Sep-2016 Chih-hung Hsieh <chh@google.com> Merge "Emit macros with proper parentheses." am: 7d33a02d15 am: a27e302c46
am: 09de6a61c5

Change-Id: Ica896aa635f4dd4d0cc5a04b891902a11677b0d7
09de6a61c5f22f1bc2d4071d0b4d63e1caa780d9 06-Sep-2016 Chih-hung Hsieh <chh@google.com> Merge "Emit macros with proper parentheses." am: 7d33a02d15
am: a27e302c46

Change-Id: I112d060ccbabd1ef37e9b0860fa5b9bb4c13df7c
a27e302c467deb6335915e827ad00c8564b69498 06-Sep-2016 Chih-hung Hsieh <chh@google.com> Merge "Emit macros with proper parentheses."
am: 7d33a02d15

Change-Id: I3eb8e6b2b0532f88521c84d833ad957cfa6993e3
7d33a02d1558092751915062611de4b29b998a67 06-Sep-2016 Chih-hung Hsieh <chh@google.com> Merge "Emit macros with proper parentheses."
1d77b89ba8343bfc342c49d6b3182ccd61a77ada 02-Sep-2016 Chih-Hung Hsieh <chh@google.com> Emit macros with proper parentheses.

* Add parentheses around parameters of the output ZR_ macro.
Bug: 28705665
Bug: 30837394
Test: build with WITH_TIDY=1

This is cherry-pick from upstream:
https://github.com/google/protobuf/commit/96a9d97352436c7284e8194e103ca8d92649ad02

Change-Id: I434d3795ac203113f5444f38d6b705f38b637caa
rc/google/protobuf/compiler/cpp/cpp_message.cc
rc/google/protobuf/descriptor.pb.cc
454e6cabe407b4ffc95f3ae8abf3b99573eca9d6 12-Aug-2016 Yabin Cui <yabinc@google.com> Support building lite static libraries on host and platform. am: 48b07ad0a7 am: 5ec5537033 -s ours
am: 403b0ab136

Change-Id: I983a488605fb4b1280a3076412a1c34530a45ac5
403b0ab136d1d83cac46bf8b93d8a742dc6115de 12-Aug-2016 Yabin Cui <yabinc@google.com> Support building lite static libraries on host and platform. am: 48b07ad0a7
am: 5ec5537033 -s ours

Change-Id: I93cbd9bb22a0cd019093a69e68da67f5de471f29
5ec5537033ad371b1046f2db455ad27fa082176f 12-Aug-2016 Yabin Cui <yabinc@google.com> Support building lite static libraries on host and platform.
am: 48b07ad0a7

Change-Id: I84b1f6e4d9d164320f0167f36c8922f260d119b6
f1a7debb039971bcd4adc8ad594fef3984afafe8 02-Aug-2016 Dan Willemsen <dwillemsen@google.com> Merge "Convert native code to Soong" am: ec22f49c86 am: 852af617e3 am: 5cc6a814a1
am: 9a8c313ee4

Change-Id: I108d9b9b529b1f573f16ff18a76d59992c638c12
9a8c313ee44de9054680366469ffabda74112707 02-Aug-2016 Dan Willemsen <dwillemsen@google.com> Merge "Convert native code to Soong" am: ec22f49c86 am: 852af617e3
am: 5cc6a814a1

Change-Id: Id5c029117e272254d761b39242e9cc6befc15131
5cc6a814a13e257f81e0f0e4b367369e80c1f9cc 02-Aug-2016 Dan Willemsen <dwillemsen@google.com> Merge "Convert native code to Soong" am: ec22f49c86
am: 852af617e3

Change-Id: I36f2e2cec6037271ac099068e01ef44c4c07cfb7
852af617e389db4b03cfa39544f6828ed6a3c45c 02-Aug-2016 Dan Willemsen <dwillemsen@google.com> Merge "Convert native code to Soong"
am: ec22f49c86

Change-Id: I6992f8903fa8873e661bfa7d6e5a5376ee909178
ec22f49c8648e2f8a6aa263c26545cd9813a24f9 02-Aug-2016 Dan Willemsen <dwillemsen@google.com> Merge "Convert native code to Soong"
8e8fd53a931f6d9cf4e769d17e284bee0a2c4d8b 01-Aug-2016 Dan Willemsen <dwillemsen@google.com> Convert native code to Soong

Soong doesn't yet support Java, so leave those parts in the Android.mk.

Merged-In: Iaeefd54a05190fb5d39a6d79175b1bfeb8cc2a02
Change-Id: Iaeefd54a05190fb5d39a6d79175b1bfeb8cc2a02
ndroid.bp
ndroid.mk
f947cd084401d0d2f4aa1811e0ebe265dfc4f511 02-Aug-2016 Dan Willemsen <dwillemsen@google.com> Convert native code to Soong am: 1ff41e0c8e am: d534f8feac
am: 2c42fc8f4f

Change-Id: I3383defe2a321dcc5d32b4102449882c1df180a2
2c42fc8f4fd4cab205cd6bd31ab8e7c10c3c6bd4 02-Aug-2016 Dan Willemsen <dwillemsen@google.com> Convert native code to Soong am: 1ff41e0c8e
am: d534f8feac

Change-Id: Idaeba87c416fd9f321d4e69192c866572c8c43a8
d534f8feaca5546cb4f0cead5a1908cd245d75a4 02-Aug-2016 Dan Willemsen <dwillemsen@google.com> Convert native code to Soong
am: 1ff41e0c8e

Change-Id: Idd40dc1fba1b1ef92aa5b4694cef9c0d43a36991
48b07ad0a7d451a1a12e021b09ec15db58172e81 03-Jun-2016 Yabin Cui <yabinc@google.com> Support building lite static libraries on host and platform.

It is to support using protobuf in simpleperf.

Bug: 28114205

(cherry picked from commit 63d886b7d36c61b22b5fea2fb4877c4904ba3601)

Change-Id: Ife40267283c0dca58ca2b2899a0b77211ba81baf
ndroid.mk
1ff41e0c8e594d8c0a1269f7b07e8e4390753215 01-Aug-2016 Dan Willemsen <dwillemsen@google.com> Convert native code to Soong

Soong doesn't yet support Java, so leave those parts in the Android.mk.

Change-Id: Iaeefd54a05190fb5d39a6d79175b1bfeb8cc2a02
ndroid.bp
ndroid.mk
05f1e4a1d2b4a379d9cd8f3899423499834982f0 12-Jul-2016 Tamas Berghammer <tberghammer@google.com> Remove 2 usage of isspace as they are not stl port compatible

Replace the 2 remaining usage of isspace with ascii_isspace what is
used in every other place inside protobuf.

Change-Id: Icabbb98f7cde600b1db7eb012062f37315b74b7d
rc/google/protobuf/util/internal/utility.cc
649a62b5a3ff614b4369c2f7ffc5fecd85a5f573 03-Jun-2016 Yabin Cui <yabinc@google.com> Support building lite static libraries on host and platform.

It is to support using protobuf in simpleperf.

Bug: 28114205
Change-Id: Ie6adeabd8cbec71d165ed584b1e2471e4a45ef4e
(cherry picked from commit 63d886b7d36c61b22b5fea2fb4877c4904ba3601)
ndroid.mk
82a6ace7767e45cffdc1272fbb5218883fd63aa3 22-Jun-2016 Tamas Berghammer <tberghammer@google.com> Detect if RTTI is enabled based on a compiler defined macro

Bug: b/28974522
Change-Id: Ia76844a56aa8c59e40969fb5bd98b5aa4b3249c2
rc/google/protobuf/arena.h
rc/google/protobuf/generated_message_reflection.h
46a5514a817e93f3a6ae265473dad4346e339346 14-Jun-2016 Tamas Berghammer <tberghammer@google.com> Fix the nano java package name in one of the test

Bug: b/28974522
Change-Id: I6675d9cf57154b06062cba7ef179512535ef7e3b
avanano/src/device/test/java/com/google/protobuf/nano/NanoAndroidTest.java
b245073ab81c52ff250516355d62cc494810e845 14-Jun-2016 Tamas Berghammer <tberghammer@google.com> Fix some unused parameter warnings

These files are included from the generated proto header files so they
will generate warnings for each user and preventing them from compiling
with -Werror.

Bug: b/28974522
Change-Id: Ib076d3ed4da0e61fcf5b390ed2676cee80e52954
rc/google/protobuf/arena.h
rc/google/protobuf/stubs/shared_ptr.h
24dd880887bbb7679a8ab33b39c76bf7ebdb5164 11-Jun-2016 Tamas Berghammer <tberghammer@google.com> Register the java micro code generator in protoc

Bug: b/28974522
Change-Id: Ia8c2b4ea2582d38be42ea88d0729824f90a40649
rc/google/protobuf/compiler/main.cc
973e36ced54921a6e09823d9e881dda7378aaf92 14-Jun-2016 Yabin Cui <yabinc@google.com> resolve merge conflicts of 536d7e9 to nyc-dev-plus-aosp am: 0c5ecea3dc
am: 2ad36b6925

Change-Id: I463718cd8b3be4fbd498f36730d6bbfa25474bb3
2ad36b69254c0dbfefedace2745dedb4646e4403 14-Jun-2016 Yabin Cui <yabinc@google.com> resolve merge conflicts of 536d7e9 to nyc-dev-plus-aosp
am: 0c5ecea3dc

Change-Id: I90d0516f020512d91bff87d7ac19a3796099dadb
0c5ecea3dcbef42808720186473604c2d8978224 14-Jun-2016 Yabin Cui <yabinc@google.com> resolve merge conflicts of 536d7e9 to nyc-dev-plus-aosp

Change-Id: Idd32fc68238209aa01823e3009220849ad95f5e6
536d7e951cce5d0fc8df7b3b126dad837f8dcc26 14-Jun-2016 Yabin Cui <yabinc@google.com> Merge \"Support building lite static libraries on host and platform.\"
am: 0b9179f480

Change-Id: I7642d9c15533fc580d4509990f848fa4df0860db
0b9179f480fe858c738a83aa4211d4982e7a4d81 14-Jun-2016 Yabin Cui <yabinc@google.com> Merge "Support building lite static libraries on host and platform."
1035d9b3495b71c61b18dc77f9ad70e1e6eb37aa 10-Jun-2016 Tamas Berghammer <tberghammer@google.com> Fix the build systems after updating to v3.0.0-beta-3

Change-Id: I9eccc0cc104d7f411ea088f80aaeb7e10d7e7463
ndroid.mk
akefile.in
uild.gradle
63d886b7d36c61b22b5fea2fb4877c4904ba3601 03-Jun-2016 Yabin Cui <yabinc@google.com> Support building lite static libraries on host and platform.

It is to support using protobuf in simpleperf.

Bug: 28114205
Change-Id: Ie6adeabd8cbec71d165ed584b1e2471e4a45ef4e
ndroid.mk
b0575e93e4c39dec69365b850088a1eb7f82c5b3 04-Jun-2016 Tamas Berghammer <tberghammer@google.com> Update from protobuf v2.6.1 to protobuf 3.0.0-beta-3

This change just copies the upstream code into the repository without
fixing the Android.mk or fixing the possible cmpile errors. All of those
will be fixed with foloowup CLs.

Bug: b/28974522
Change-Id: I79fb3966dbef85915965692fa6ab14dc611ed9ea
gitignore
UILD
HANGES.txt
ONTRIBUTORS.txt
ICENSE
akefile.am
rotobuf.podspec
EADME.md
ORKSPACE
ppveyor.bat
ppveyor.yml
utogen.sh
enchmarks/Makefile.am
enchmarks/README.md
enchmarks/benchmark_messages_proto2.proto
enchmarks/benchmark_messages_proto3.proto
enchmarks/benchmarks.proto
enchmarks/generate_datasets.cc
enchmarks/google_size.proto
enchmarks/google_speed.proto
make/CMakeLists.txt
make/README.md
make/extract_includes.bat.in
make/install.cmake
make/libprotobuf-lite.cmake
make/libprotobuf.cmake
make/libprotoc.cmake
make/protobuf-config-version.cmake.in
make/protobuf-config.cmake.in
make/protobuf-module.cmake.in
make/protoc.cmake
make/tests.cmake
onfigure.ac
onformance/ConformanceJava.java
onformance/ConformanceJavaLite.java
onformance/Makefile.am
onformance/README.md
onformance/conformance.proto
onformance/conformance_cpp.cc
onformance/conformance_objc.m
onformance/conformance_python.py
onformance/conformance_ruby.rb
onformance/conformance_test.cc
onformance/conformance_test.h
onformance/conformance_test_runner.cc
onformance/failure_list_cpp.txt
onformance/failure_list_csharp.txt
onformance/failure_list_java.txt
onformance/failure_list_objc.txt
onformance/failure_list_python-post26.txt
onformance/failure_list_python.txt
onformance/failure_list_python_cpp.txt
onformance/failure_list_ruby.txt
onformance/third_party/jsoncpp/json.h
onformance/third_party/jsoncpp/jsoncpp.cpp
sharp/.gitignore
sharp/CHANGES.txt
sharp/Google.Protobuf.Tools.nuspec
sharp/README.md
sharp/build_packages.bat
sharp/buildall.sh
sharp/generate_protos.sh
sharp/keys/Google.Protobuf.public.snk
sharp/keys/Google.Protobuf.snk
sharp/keys/README.md
sharp/protos/unittest_issues.proto
sharp/src/AddressBook/AddPerson.cs
sharp/src/AddressBook/AddressBook.csproj
sharp/src/AddressBook/Addressbook.cs
sharp/src/AddressBook/ListPeople.cs
sharp/src/AddressBook/Program.cs
sharp/src/AddressBook/Properties/AssemblyInfo.cs
sharp/src/AddressBook/SampleUsage.cs
sharp/src/AddressBook/app.config
sharp/src/Google.Protobuf.Conformance/App.config
sharp/src/Google.Protobuf.Conformance/Conformance.cs
sharp/src/Google.Protobuf.Conformance/Google.Protobuf.Conformance.csproj
sharp/src/Google.Protobuf.Conformance/Program.cs
sharp/src/Google.Protobuf.Conformance/Properties/AssemblyInfo.cs
sharp/src/Google.Protobuf.JsonDump/Google.Protobuf.JsonDump.csproj
sharp/src/Google.Protobuf.JsonDump/Program.cs
sharp/src/Google.Protobuf.JsonDump/Properties/AssemblyInfo.cs
sharp/src/Google.Protobuf.JsonDump/app.config
sharp/src/Google.Protobuf.Test/ByteStringTest.cs
sharp/src/Google.Protobuf.Test/CodedInputStreamExtensions.cs
sharp/src/Google.Protobuf.Test/CodedInputStreamTest.cs
sharp/src/Google.Protobuf.Test/CodedOutputStreamTest.cs
sharp/src/Google.Protobuf.Test/Collections/MapFieldTest.cs
sharp/src/Google.Protobuf.Test/Collections/RepeatedFieldTest.cs
sharp/src/Google.Protobuf.Test/Compatibility/PropertyInfoExtensionsTest.cs
sharp/src/Google.Protobuf.Test/Compatibility/TypeExtensionsTest.cs
sharp/src/Google.Protobuf.Test/DeprecatedMemberTest.cs
sharp/src/Google.Protobuf.Test/EqualityTester.cs
sharp/src/Google.Protobuf.Test/FieldCodecTest.cs
sharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs
sharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj
sharp/src/Google.Protobuf.Test/IssuesTest.cs
sharp/src/Google.Protobuf.Test/JsonFormatterTest.cs
sharp/src/Google.Protobuf.Test/JsonParserTest.cs
sharp/src/Google.Protobuf.Test/JsonTokenizerTest.cs
sharp/src/Google.Protobuf.Test/Properties/AppManifest.xml
sharp/src/Google.Protobuf.Test/Properties/AssemblyInfo.cs
sharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs
sharp/src/Google.Protobuf.Test/Reflection/FieldAccessTest.cs
sharp/src/Google.Protobuf.Test/Reflection/TypeRegistryTest.cs
sharp/src/Google.Protobuf.Test/SampleEnum.cs
sharp/src/Google.Protobuf.Test/SampleMessages.cs
sharp/src/Google.Protobuf.Test/TestCornerCases.cs
sharp/src/Google.Protobuf.Test/TestProtos/ForeignMessagePartial.cs
sharp/src/Google.Protobuf.Test/TestProtos/MapUnittestProto3.cs
sharp/src/Google.Protobuf.Test/TestProtos/UnittestImportProto3.cs
sharp/src/Google.Protobuf.Test/TestProtos/UnittestImportPublicProto3.cs
sharp/src/Google.Protobuf.Test/TestProtos/UnittestIssues.cs
sharp/src/Google.Protobuf.Test/TestProtos/UnittestProto3.cs
sharp/src/Google.Protobuf.Test/TestProtos/UnittestWellKnownTypes.cs
sharp/src/Google.Protobuf.Test/WellKnownTypes/AnyTest.cs
sharp/src/Google.Protobuf.Test/WellKnownTypes/DurationTest.cs
sharp/src/Google.Protobuf.Test/WellKnownTypes/FieldMaskTest.cs
sharp/src/Google.Protobuf.Test/WellKnownTypes/TimestampTest.cs
sharp/src/Google.Protobuf.Test/WellKnownTypes/WrappersTest.cs
sharp/src/Google.Protobuf.Test/packages.config
sharp/src/Google.Protobuf.sln
sharp/src/Google.Protobuf/ByteArray.cs
sharp/src/Google.Protobuf/ByteString.cs
sharp/src/Google.Protobuf/CodedInputStream.cs
sharp/src/Google.Protobuf/CodedOutputStream.ComputeSize.cs
sharp/src/Google.Protobuf/CodedOutputStream.cs
sharp/src/Google.Protobuf/Collections/MapField.cs
sharp/src/Google.Protobuf/Collections/ReadOnlyDictionary.cs
sharp/src/Google.Protobuf/Collections/RepeatedField.cs
sharp/src/Google.Protobuf/Compatibility/PropertyInfoExtensions.cs
sharp/src/Google.Protobuf/Compatibility/TypeExtensions.cs
sharp/src/Google.Protobuf/FieldCodec.cs
sharp/src/Google.Protobuf/FrameworkPortability.cs
sharp/src/Google.Protobuf/Google.Protobuf.csproj
sharp/src/Google.Protobuf/Google.Protobuf.nuspec
sharp/src/Google.Protobuf/ICustomDiagnosticMessage.cs
sharp/src/Google.Protobuf/IDeepCloneable.cs
sharp/src/Google.Protobuf/IMessage.cs
sharp/src/Google.Protobuf/InvalidJsonException.cs
sharp/src/Google.Protobuf/InvalidProtocolBufferException.cs
sharp/src/Google.Protobuf/JsonFormatter.cs
sharp/src/Google.Protobuf/JsonParser.cs
sharp/src/Google.Protobuf/JsonToken.cs
sharp/src/Google.Protobuf/JsonTokenizer.cs
sharp/src/Google.Protobuf/LimitedInputStream.cs
sharp/src/Google.Protobuf/MessageExtensions.cs
sharp/src/Google.Protobuf/MessageParser.cs
sharp/src/Google.Protobuf/Properties/AssemblyInfo.cs
sharp/src/Google.Protobuf/ProtoPreconditions.cs
sharp/src/Google.Protobuf/Reflection/Descriptor.cs
sharp/src/Google.Protobuf/Reflection/DescriptorBase.cs
sharp/src/Google.Protobuf/Reflection/DescriptorPool.cs
sharp/src/Google.Protobuf/Reflection/DescriptorUtil.cs
sharp/src/Google.Protobuf/Reflection/DescriptorValidationException.cs
sharp/src/Google.Protobuf/Reflection/EnumDescriptor.cs
sharp/src/Google.Protobuf/Reflection/EnumValueDescriptor.cs
sharp/src/Google.Protobuf/Reflection/FieldAccessorBase.cs
sharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs
sharp/src/Google.Protobuf/Reflection/FieldType.cs
sharp/src/Google.Protobuf/Reflection/FileDescriptor.cs
sharp/src/Google.Protobuf/Reflection/GeneratedClrTypeInfo.cs
sharp/src/Google.Protobuf/Reflection/IDescriptor.cs
sharp/src/Google.Protobuf/Reflection/IFieldAccessor.cs
sharp/src/Google.Protobuf/Reflection/MapFieldAccessor.cs
sharp/src/Google.Protobuf/Reflection/MessageDescriptor.cs
sharp/src/Google.Protobuf/Reflection/MethodDescriptor.cs
sharp/src/Google.Protobuf/Reflection/OneofAccessor.cs
sharp/src/Google.Protobuf/Reflection/OneofDescriptor.cs
sharp/src/Google.Protobuf/Reflection/OriginalNameAttribute.cs
sharp/src/Google.Protobuf/Reflection/PackageDescriptor.cs
sharp/src/Google.Protobuf/Reflection/PartialClasses.cs
sharp/src/Google.Protobuf/Reflection/ReflectionUtil.cs
sharp/src/Google.Protobuf/Reflection/RepeatedFieldAccessor.cs
sharp/src/Google.Protobuf/Reflection/ServiceDescriptor.cs
sharp/src/Google.Protobuf/Reflection/SingleFieldAccessor.cs
sharp/src/Google.Protobuf/Reflection/TypeRegistry.cs
sharp/src/Google.Protobuf/WellKnownTypes/Any.cs
sharp/src/Google.Protobuf/WellKnownTypes/AnyPartial.cs
sharp/src/Google.Protobuf/WellKnownTypes/Api.cs
sharp/src/Google.Protobuf/WellKnownTypes/Duration.cs
sharp/src/Google.Protobuf/WellKnownTypes/DurationPartial.cs
sharp/src/Google.Protobuf/WellKnownTypes/Empty.cs
sharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs
sharp/src/Google.Protobuf/WellKnownTypes/FieldMaskPartial.cs
sharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs
sharp/src/Google.Protobuf/WellKnownTypes/Struct.cs
sharp/src/Google.Protobuf/WellKnownTypes/TimeExtensions.cs
sharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs
sharp/src/Google.Protobuf/WellKnownTypes/TimestampPartial.cs
sharp/src/Google.Protobuf/WellKnownTypes/Type.cs
sharp/src/Google.Protobuf/WellKnownTypes/ValuePartial.cs
sharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs
sharp/src/Google.Protobuf/WellKnownTypes/WrappersPartial.cs
sharp/src/Google.Protobuf/WireFormat.cs
sharp/src/Google.Protobuf/packages.config
sharp/src/packages/repositories.config
ocs/swift/DesignDoc.md
ocs/third_party.md
ditors/proto.vim
ditors/protobuf-mode.el
xamples/AddPerson.java
xamples/ListPeople.java
xamples/Makefile
xamples/README.txt
xamples/add_person.cc
xamples/add_person.go
xamples/add_person.py
xamples/add_person_test.go
xamples/addressbook.proto
xamples/list_people.cc
xamples/list_people.go
xamples/list_people.py
xamples/list_people_test.go
enerate_descriptor_proto.sh
mock.BUILD
ava/README.md
ava/README.txt
ava/core/generate-sources-build.xml
ava/core/generate-test-sources-build.xml
ava/core/pom.xml
ava/core/src/main/java/com/google/protobuf/AbstractMessage.java
ava/core/src/main/java/com/google/protobuf/AbstractMessageLite.java
ava/core/src/main/java/com/google/protobuf/AbstractParser.java
ava/core/src/main/java/com/google/protobuf/AbstractProtobufList.java
ava/core/src/main/java/com/google/protobuf/BlockingRpcChannel.java
ava/core/src/main/java/com/google/protobuf/BlockingService.java
ava/core/src/main/java/com/google/protobuf/BooleanArrayList.java
ava/core/src/main/java/com/google/protobuf/ByteBufferWriter.java
ava/core/src/main/java/com/google/protobuf/ByteOutput.java
ava/core/src/main/java/com/google/protobuf/ByteString.java
ava/core/src/main/java/com/google/protobuf/CodedInputStream.java
ava/core/src/main/java/com/google/protobuf/CodedOutputStream.java
ava/core/src/main/java/com/google/protobuf/Descriptors.java
ava/core/src/main/java/com/google/protobuf/DoubleArrayList.java
ava/core/src/main/java/com/google/protobuf/DynamicMessage.java
ava/core/src/main/java/com/google/protobuf/ExperimentalApi.java
ava/core/src/main/java/com/google/protobuf/Extension.java
ava/core/src/main/java/com/google/protobuf/ExtensionLite.java
ava/core/src/main/java/com/google/protobuf/ExtensionRegistry.java
ava/core/src/main/java/com/google/protobuf/ExtensionRegistryLite.java
ava/core/src/main/java/com/google/protobuf/FieldSet.java
ava/core/src/main/java/com/google/protobuf/FloatArrayList.java
ava/core/src/main/java/com/google/protobuf/GeneratedMessage.java
ava/core/src/main/java/com/google/protobuf/GeneratedMessageLite.java
ava/core/src/main/java/com/google/protobuf/IntArrayList.java
ava/core/src/main/java/com/google/protobuf/Internal.java
ava/core/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java
ava/core/src/main/java/com/google/protobuf/LazyField.java
ava/core/src/main/java/com/google/protobuf/LazyFieldLite.java
ava/core/src/main/java/com/google/protobuf/LazyStringArrayList.java
ava/core/src/main/java/com/google/protobuf/LazyStringList.java
ava/core/src/main/java/com/google/protobuf/LongArrayList.java
ava/core/src/main/java/com/google/protobuf/MapEntry.java
ava/core/src/main/java/com/google/protobuf/MapEntryLite.java
ava/core/src/main/java/com/google/protobuf/MapField.java
ava/core/src/main/java/com/google/protobuf/MapFieldLite.java
ava/core/src/main/java/com/google/protobuf/Message.java
ava/core/src/main/java/com/google/protobuf/MessageLite.java
ava/core/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java
ava/core/src/main/java/com/google/protobuf/MessageLiteToString.java
ava/core/src/main/java/com/google/protobuf/MessageOrBuilder.java
ava/core/src/main/java/com/google/protobuf/MessageReflection.java
ava/core/src/main/java/com/google/protobuf/MutabilityOracle.java
ava/core/src/main/java/com/google/protobuf/NioByteString.java
ava/core/src/main/java/com/google/protobuf/Parser.java
ava/core/src/main/java/com/google/protobuf/ProtobufArrayList.java
ava/core/src/main/java/com/google/protobuf/ProtocolMessageEnum.java
ava/core/src/main/java/com/google/protobuf/ProtocolStringList.java
ava/core/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java
ava/core/src/main/java/com/google/protobuf/RopeByteString.java
ava/core/src/main/java/com/google/protobuf/RpcCallback.java
ava/core/src/main/java/com/google/protobuf/RpcChannel.java
ava/core/src/main/java/com/google/protobuf/RpcController.java
ava/core/src/main/java/com/google/protobuf/RpcUtil.java
ava/core/src/main/java/com/google/protobuf/Service.java
ava/core/src/main/java/com/google/protobuf/ServiceException.java
ava/core/src/main/java/com/google/protobuf/SingleFieldBuilder.java
ava/core/src/main/java/com/google/protobuf/SmallSortedMap.java
ava/core/src/main/java/com/google/protobuf/TextFormat.java
ava/core/src/main/java/com/google/protobuf/TextFormatEscaper.java
ava/core/src/main/java/com/google/protobuf/TextFormatParseInfoTree.java
ava/core/src/main/java/com/google/protobuf/TextFormatParseLocation.java
ava/core/src/main/java/com/google/protobuf/UninitializedMessageException.java
ava/core/src/main/java/com/google/protobuf/UnknownFieldSet.java
ava/core/src/main/java/com/google/protobuf/UnknownFieldSetLite.java
ava/core/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java
ava/core/src/main/java/com/google/protobuf/UnsafeByteOperations.java
ava/core/src/main/java/com/google/protobuf/Utf8.java
ava/core/src/main/java/com/google/protobuf/WireFormat.java
ava/core/src/test/java/com/google/protobuf/AbstractMessageTest.java
ava/core/src/test/java/com/google/protobuf/AnyTest.java
ava/core/src/test/java/com/google/protobuf/BooleanArrayListTest.java
ava/core/src/test/java/com/google/protobuf/BoundedByteStringTest.java
ava/core/src/test/java/com/google/protobuf/ByteBufferWriterTest.java
ava/core/src/test/java/com/google/protobuf/ByteStringTest.java
ava/core/src/test/java/com/google/protobuf/CheckUtf8Test.java
ava/core/src/test/java/com/google/protobuf/CodedInputStreamTest.java
ava/core/src/test/java/com/google/protobuf/CodedOutputStreamTest.java
ava/core/src/test/java/com/google/protobuf/DeprecatedFieldTest.java
ava/core/src/test/java/com/google/protobuf/DescriptorsTest.java
ava/core/src/test/java/com/google/protobuf/DoubleArrayListTest.java
ava/core/src/test/java/com/google/protobuf/DynamicMessageTest.java
ava/core/src/test/java/com/google/protobuf/EnumTest.java
ava/core/src/test/java/com/google/protobuf/FieldPresenceTest.java
ava/core/src/test/java/com/google/protobuf/FloatArrayListTest.java
ava/core/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java
ava/core/src/test/java/com/google/protobuf/GeneratedMessageTest.java
ava/core/src/test/java/com/google/protobuf/IntArrayListTest.java
ava/core/src/test/java/com/google/protobuf/IsValidUtf8Test.java
ava/core/src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java
ava/core/src/test/java/com/google/protobuf/LazyFieldLiteTest.java
ava/core/src/test/java/com/google/protobuf/LazyFieldTest.java
ava/core/src/test/java/com/google/protobuf/LazyMessageLiteTest.java
ava/core/src/test/java/com/google/protobuf/LazyStringArrayListTest.java
ava/core/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java
ava/core/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java
ava/core/src/test/java/com/google/protobuf/LiteTest.java
ava/core/src/test/java/com/google/protobuf/LiteralByteStringTest.java
ava/core/src/test/java/com/google/protobuf/LongArrayListTest.java
ava/core/src/test/java/com/google/protobuf/MapForProto2LiteTest.java
ava/core/src/test/java/com/google/protobuf/MapForProto2Test.java
ava/core/src/test/java/com/google/protobuf/MapTest.java
ava/core/src/test/java/com/google/protobuf/MessageTest.java
ava/core/src/test/java/com/google/protobuf/NestedBuildersTest.java
ava/core/src/test/java/com/google/protobuf/NioByteStringTest.java
ava/core/src/test/java/com/google/protobuf/ParseExceptionsTest.java
ava/core/src/test/java/com/google/protobuf/ParserTest.java
ava/core/src/test/java/com/google/protobuf/ProtobufArrayListTest.java
ava/core/src/test/java/com/google/protobuf/RepeatedFieldBuilderTest.java
ava/core/src/test/java/com/google/protobuf/RopeByteStringSubstringTest.java
ava/core/src/test/java/com/google/protobuf/RopeByteStringTest.java
ava/core/src/test/java/com/google/protobuf/ServiceTest.java
ava/core/src/test/java/com/google/protobuf/SingleFieldBuilderTest.java
ava/core/src/test/java/com/google/protobuf/SmallSortedMapTest.java
ava/core/src/test/java/com/google/protobuf/TestBadIdentifiers.java
ava/core/src/test/java/com/google/protobuf/TestUtil.java
ava/core/src/test/java/com/google/protobuf/TestUtilLite.java
ava/core/src/test/java/com/google/protobuf/TextFormatParseInfoTreeTest.java
ava/core/src/test/java/com/google/protobuf/TextFormatParseLocationTest.java
ava/core/src/test/java/com/google/protobuf/TextFormatTest.java
ava/core/src/test/java/com/google/protobuf/UnknownEnumValueTest.java
ava/core/src/test/java/com/google/protobuf/UnknownFieldSetLiteTest.java
ava/core/src/test/java/com/google/protobuf/UnknownFieldSetTest.java
ava/core/src/test/java/com/google/protobuf/UnmodifiableLazyStringListTest.java
ava/core/src/test/java/com/google/protobuf/WellKnownTypesTest.java
ava/core/src/test/java/com/google/protobuf/WireFormatTest.java
ava/core/src/test/proto/com/google/protobuf/any_test.proto
ava/core/src/test/proto/com/google/protobuf/field_presence_test.proto
ava/core/src/test/proto/com/google/protobuf/lazy_fields_lite.proto
ava/core/src/test/proto/com/google/protobuf/lite_equals_and_hash.proto
ava/core/src/test/proto/com/google/protobuf/map_for_proto2_lite_test.proto
ava/core/src/test/proto/com/google/protobuf/map_for_proto2_test.proto
ava/core/src/test/proto/com/google/protobuf/map_initialization_order_test.proto
ava/core/src/test/proto/com/google/protobuf/map_test.proto
ava/core/src/test/proto/com/google/protobuf/multiple_files_test.proto
ava/core/src/test/proto/com/google/protobuf/nested_builders_test.proto
ava/core/src/test/proto/com/google/protobuf/nested_extension.proto
ava/core/src/test/proto/com/google/protobuf/nested_extension_lite.proto
ava/core/src/test/proto/com/google/protobuf/non_nested_extension.proto
ava/core/src/test/proto/com/google/protobuf/non_nested_extension_lite.proto
ava/core/src/test/proto/com/google/protobuf/outer_class_name_test.proto
ava/core/src/test/proto/com/google/protobuf/outer_class_name_test2.proto
ava/core/src/test/proto/com/google/protobuf/outer_class_name_test3.proto
ava/core/src/test/proto/com/google/protobuf/test_bad_identifiers.proto
ava/core/src/test/proto/com/google/protobuf/test_check_utf8.proto
ava/core/src/test/proto/com/google/protobuf/test_check_utf8_size.proto
ava/core/src/test/proto/com/google/protobuf/test_custom_options.proto
ava/core/src/test/proto/com/google/protobuf/test_extra_interfaces.proto
ava/lite/generate-sources-build.xml
ava/lite/generate-test-sources-build.xml
ava/lite/pom.xml
ava/pom.xml
ava/src/device/main/java/com/google/protobuf/nano/android/ParcelableExtendableMessageNano.java
ava/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNano.java
ava/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNanoCreator.java
ava/src/device/test/AndroidManifest.xml
ava/src/device/test/java/com/google/protobuf/nano/NanoAndroidTest.java
ava/src/main/java/com/google/protobuf/AbstractMessage.java
ava/src/main/java/com/google/protobuf/AbstractMessageLite.java
ava/src/main/java/com/google/protobuf/AbstractParser.java
ava/src/main/java/com/google/protobuf/BlockingRpcChannel.java
ava/src/main/java/com/google/protobuf/BlockingService.java
ava/src/main/java/com/google/protobuf/BoundedByteString.java
ava/src/main/java/com/google/protobuf/ByteString.java
ava/src/main/java/com/google/protobuf/CodedInputStream.java
ava/src/main/java/com/google/protobuf/CodedOutputStream.java
ava/src/main/java/com/google/protobuf/Descriptors.java
ava/src/main/java/com/google/protobuf/DynamicMessage.java
ava/src/main/java/com/google/protobuf/Extension.java
ava/src/main/java/com/google/protobuf/ExtensionRegistry.java
ava/src/main/java/com/google/protobuf/ExtensionRegistryLite.java
ava/src/main/java/com/google/protobuf/FieldSet.java
ava/src/main/java/com/google/protobuf/GeneratedMessage.java
ava/src/main/java/com/google/protobuf/GeneratedMessageLite.java
ava/src/main/java/com/google/protobuf/Internal.java
ava/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java
ava/src/main/java/com/google/protobuf/LazyField.java
ava/src/main/java/com/google/protobuf/LazyFieldLite.java
ava/src/main/java/com/google/protobuf/LazyStringArrayList.java
ava/src/main/java/com/google/protobuf/LazyStringList.java
ava/src/main/java/com/google/protobuf/LiteralByteString.java
ava/src/main/java/com/google/protobuf/Message.java
ava/src/main/java/com/google/protobuf/MessageLite.java
ava/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java
ava/src/main/java/com/google/protobuf/MessageOrBuilder.java
ava/src/main/java/com/google/protobuf/MessageReflection.java
ava/src/main/java/com/google/protobuf/Parser.java
ava/src/main/java/com/google/protobuf/ProtocolMessageEnum.java
ava/src/main/java/com/google/protobuf/ProtocolStringList.java
ava/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java
ava/src/main/java/com/google/protobuf/RopeByteString.java
ava/src/main/java/com/google/protobuf/RpcCallback.java
ava/src/main/java/com/google/protobuf/RpcChannel.java
ava/src/main/java/com/google/protobuf/RpcController.java
ava/src/main/java/com/google/protobuf/RpcUtil.java
ava/src/main/java/com/google/protobuf/Service.java
ava/src/main/java/com/google/protobuf/ServiceException.java
ava/src/main/java/com/google/protobuf/SingleFieldBuilder.java
ava/src/main/java/com/google/protobuf/SmallSortedMap.java
ava/src/main/java/com/google/protobuf/TextFormat.java
ava/src/main/java/com/google/protobuf/UninitializedMessageException.java
ava/src/main/java/com/google/protobuf/UnknownFieldSet.java
ava/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java
ava/src/main/java/com/google/protobuf/Utf8.java
ava/src/main/java/com/google/protobuf/WireFormat.java
ava/src/main/java/com/google/protobuf/micro/ByteStringMicro.java
ava/src/main/java/com/google/protobuf/micro/CodedInputStreamMicro.java
ava/src/main/java/com/google/protobuf/micro/CodedOutputStreamMicro.java
ava/src/main/java/com/google/protobuf/micro/InvalidProtocolBufferMicroException.java
ava/src/main/java/com/google/protobuf/micro/MessageMicro.java
ava/src/main/java/com/google/protobuf/micro/WireFormatMicro.java
ava/src/main/java/com/google/protobuf/nano/CodedInputByteBufferNano.java
ava/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java
ava/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
ava/src/main/java/com/google/protobuf/nano/Extension.java
ava/src/main/java/com/google/protobuf/nano/FieldArray.java
ava/src/main/java/com/google/protobuf/nano/FieldData.java
ava/src/main/java/com/google/protobuf/nano/InternalNano.java
ava/src/main/java/com/google/protobuf/nano/InvalidProtocolBufferNanoException.java
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
ava/src/main/java/com/google/protobuf/nano/UnknownFieldData.java
ava/src/main/java/com/google/protobuf/nano/WireFormatNano.java
ava/src/test/java/com/google/protobuf/AbstractMessageTest.java
ava/src/test/java/com/google/protobuf/BoundedByteStringTest.java
ava/src/test/java/com/google/protobuf/ByteStringTest.java
ava/src/test/java/com/google/protobuf/CheckUtf8Test.java
ava/src/test/java/com/google/protobuf/CodedInputStreamTest.java
ava/src/test/java/com/google/protobuf/CodedOutputStreamTest.java
ava/src/test/java/com/google/protobuf/DeprecatedFieldTest.java
ava/src/test/java/com/google/protobuf/DescriptorsTest.java
ava/src/test/java/com/google/protobuf/DynamicMessageTest.java
ava/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java
ava/src/test/java/com/google/protobuf/GeneratedMessageTest.java
ava/src/test/java/com/google/protobuf/IsValidUtf8Test.java
ava/src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java
ava/src/test/java/com/google/protobuf/LazyFieldLiteTest.java
ava/src/test/java/com/google/protobuf/LazyFieldTest.java
ava/src/test/java/com/google/protobuf/LazyMessageLiteTest.java
ava/src/test/java/com/google/protobuf/LazyStringArrayListTest.java
ava/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java
ava/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java
ava/src/test/java/com/google/protobuf/LiteTest.java
ava/src/test/java/com/google/protobuf/LiteralByteStringTest.java
ava/src/test/java/com/google/protobuf/MessageTest.java
ava/src/test/java/com/google/protobuf/MicroTest.java
ava/src/test/java/com/google/protobuf/NanoTest.java
ava/src/test/java/com/google/protobuf/NestedBuildersTest.java
ava/src/test/java/com/google/protobuf/ParserTest.java
ava/src/test/java/com/google/protobuf/RepeatedFieldBuilderTest.java
ava/src/test/java/com/google/protobuf/RopeByteStringSubstringTest.java
ava/src/test/java/com/google/protobuf/RopeByteStringTest.java
ava/src/test/java/com/google/protobuf/ServiceTest.java
ava/src/test/java/com/google/protobuf/SingleFieldBuilderTest.java
ava/src/test/java/com/google/protobuf/SmallSortedMapTest.java
ava/src/test/java/com/google/protobuf/TestBadIdentifiers.java
ava/src/test/java/com/google/protobuf/TestUtil.java
ava/src/test/java/com/google/protobuf/TextFormatTest.java
ava/src/test/java/com/google/protobuf/UnknownFieldSetTest.java
ava/src/test/java/com/google/protobuf/UnmodifiableLazyStringListTest.java
ava/src/test/java/com/google/protobuf/WireFormatTest.java
ava/src/test/java/com/google/protobuf/lazy_fields_lite.proto
ava/src/test/java/com/google/protobuf/lite_equals_and_hash.proto
ava/src/test/java/com/google/protobuf/multiple_files_test.proto
ava/src/test/java/com/google/protobuf/nested_builders_test.proto
ava/src/test/java/com/google/protobuf/nested_extension.proto
ava/src/test/java/com/google/protobuf/nested_extension_lite.proto
ava/src/test/java/com/google/protobuf/non_nested_extension.proto
ava/src/test/java/com/google/protobuf/non_nested_extension_lite.proto
ava/src/test/java/com/google/protobuf/outer_class_name_test.proto
ava/src/test/java/com/google/protobuf/outer_class_name_test2.proto
ava/src/test/java/com/google/protobuf/outer_class_name_test3.proto
ava/src/test/java/com/google/protobuf/test_bad_identifiers.proto
ava/src/test/java/com/google/protobuf/test_check_utf8.proto
ava/src/test/java/com/google/protobuf/test_check_utf8_size.proto
ava/src/test/java/com/google/protobuf/test_custom_options.proto
ava/src/test/java/com/google/protobuf/test_extra_interfaces.proto
ava/util/pom.xml
ava/util/src/main/java/com/google/protobuf/util/FieldMaskTree.java
ava/util/src/main/java/com/google/protobuf/util/FieldMaskUtil.java
ava/util/src/main/java/com/google/protobuf/util/JsonFormat.java
ava/util/src/main/java/com/google/protobuf/util/TimeUtil.java
ava/util/src/test/java/com/google/protobuf/util/FieldMaskTreeTest.java
ava/util/src/test/java/com/google/protobuf/util/FieldMaskUtilTest.java
ava/util/src/test/java/com/google/protobuf/util/JsonFormatTest.java
ava/util/src/test/java/com/google/protobuf/util/TimeUtilTest.java
ava/util/src/test/proto/com/google/protobuf/util/json_test.proto
avamicro/src/main/java/com/google/protobuf/micro/ByteStringMicro.java
avamicro/src/main/java/com/google/protobuf/micro/CodedInputStreamMicro.java
avamicro/src/main/java/com/google/protobuf/micro/CodedOutputStreamMicro.java
avamicro/src/main/java/com/google/protobuf/micro/InvalidProtocolBufferMicroException.java
avamicro/src/main/java/com/google/protobuf/micro/MessageMicro.java
avamicro/src/main/java/com/google/protobuf/micro/WireFormatMicro.java
avanano/README.md
avanano/pom.xml
avanano/src/device/main/java/com/google/protobuf/nano/android/ParcelableExtendableMessageNano.java
avanano/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNano.java
avanano/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNanoCreator.java
avanano/src/device/test/AndroidManifest.xml
avanano/src/device/test/java/com/google/protobuf/nano/NanoAndroidTest.java
avanano/src/main/java/com/google/protobuf/nano/CodedInputByteBufferNano.java
avanano/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java
avanano/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
avanano/src/main/java/com/google/protobuf/nano/Extension.java
avanano/src/main/java/com/google/protobuf/nano/FieldArray.java
avanano/src/main/java/com/google/protobuf/nano/FieldData.java
avanano/src/main/java/com/google/protobuf/nano/InternalNano.java
avanano/src/main/java/com/google/protobuf/nano/InvalidProtocolBufferNanoException.java
avanano/src/main/java/com/google/protobuf/nano/MapFactories.java
avanano/src/main/java/com/google/protobuf/nano/MessageNano.java
avanano/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
avanano/src/main/java/com/google/protobuf/nano/UnknownFieldData.java
avanano/src/main/java/com/google/protobuf/nano/WireFormatNano.java
avanano/src/test/java/com/google/protobuf/nano/NanoTest.java
avanano/src/test/java/com/google/protobuf/nano/map_test.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_accessors_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_enum_class_multiple_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_enum_class_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_enum_validity_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_extension_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_extension_packed_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_extension_repeated_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_extension_singular_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_has_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_import_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nameclash_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_recursive_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_reference_types_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_repeated_merge_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_repeated_packables_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_simple_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_single_nano.proto
avanano/src/test/java/com/google/protobuf/nano/unittest_stringutf8_nano.proto
enkins/README.md
enkins/build_and_run_docker.sh
enkins/buildcmds/README.md
enkins/buildcmds/pull_request.sh
enkins/docker/Dockerfile
enkins/make_test_output.py
enkins/pull_request_in_docker.sh
s/README.md
s/binary/arith.js
s/binary/arith_test.js
s/binary/constants.js
s/binary/decoder.js
s/binary/decoder_test.js
s/binary/encoder.js
s/binary/proto_test.js
s/binary/reader.js
s/binary/reader_test.js
s/binary/utils.js
s/binary/utils_test.js
s/binary/writer.js
s/binary/writer_test.js
s/commonjs/export.js
s/commonjs/export_asserts.js
s/commonjs/export_testdeps.js
s/commonjs/import_test.js
s/commonjs/jasmine.json
s/commonjs/rewrite_tests_for_commonjs.js
s/commonjs/test6/test6.proto
s/commonjs/test7/test7.proto
s/data.proto
s/debug.js
s/debug_test.js
s/gulpfile.js
s/jasmine.json
s/message.js
s/message_test.js
s/node_loader.js
s/package.json
s/proto3_test.js
s/proto3_test.proto
s/test.proto
s/test2.proto
s/test3.proto
s/test4.proto
s/test5.proto
s/test_bootstrap.js
s/testbinary.proto
s/testempty.proto
4/acx_check_suncc.m4
4/libtool.m4
4/ltoptions.m4
4/ltsugar.m4
4/ltversion.m4
4/lt~obsolete.m4
4/stl_hash.m4
bjectivec/DevTools/check_version_stamps.sh
bjectivec/DevTools/compile_testing_protos.sh
bjectivec/DevTools/full_mac_build.sh
bjectivec/DevTools/pddm.py
bjectivec/DevTools/pddm_tests.py
bjectivec/GPBArray.h
bjectivec/GPBArray.m
bjectivec/GPBArray_PackagePrivate.h
bjectivec/GPBBootstrap.h
bjectivec/GPBCodedInputStream.h
bjectivec/GPBCodedInputStream.m
bjectivec/GPBCodedInputStream_PackagePrivate.h
bjectivec/GPBCodedOutputStream.h
bjectivec/GPBCodedOutputStream.m
bjectivec/GPBCodedOutputStream_PackagePrivate.h
bjectivec/GPBDescriptor.h
bjectivec/GPBDescriptor.m
bjectivec/GPBDescriptor_PackagePrivate.h
bjectivec/GPBDictionary.h
bjectivec/GPBDictionary.m
bjectivec/GPBDictionary_PackagePrivate.h
bjectivec/GPBExtensionInternals.h
bjectivec/GPBExtensionInternals.m
bjectivec/GPBExtensionRegistry.h
bjectivec/GPBExtensionRegistry.m
bjectivec/GPBMessage.h
bjectivec/GPBMessage.m
bjectivec/GPBMessage_PackagePrivate.h
bjectivec/GPBProtocolBuffers.h
bjectivec/GPBProtocolBuffers.m
bjectivec/GPBProtocolBuffers_RuntimeSupport.h
bjectivec/GPBRootObject.h
bjectivec/GPBRootObject.m
bjectivec/GPBRootObject_PackagePrivate.h
bjectivec/GPBRuntimeTypes.h
bjectivec/GPBUnknownField.h
bjectivec/GPBUnknownField.m
bjectivec/GPBUnknownFieldSet.h
bjectivec/GPBUnknownFieldSet.m
bjectivec/GPBUnknownFieldSet_PackagePrivate.h
bjectivec/GPBUnknownField_PackagePrivate.h
bjectivec/GPBUtilities.h
bjectivec/GPBUtilities.m
bjectivec/GPBUtilities_PackagePrivate.h
bjectivec/GPBWellKnownTypes.h
bjectivec/GPBWellKnownTypes.m
bjectivec/GPBWireFormat.h
bjectivec/GPBWireFormat.m
bjectivec/ProtocolBuffers_OSX.xcodeproj/project.pbxproj
bjectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/contents.xcworkspacedata
bjectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
bjectivec/ProtocolBuffers_OSX.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme
bjectivec/ProtocolBuffers_OSX.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme
bjectivec/ProtocolBuffers_iOS.xcodeproj/project.pbxproj
bjectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata
bjectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
bjectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcbaselines/8BBEA4A5147C727100C4ADB7.xcbaseline/FFE465CA-0E74-40E8-9F09-500B66B7DCB2.plist
bjectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcbaselines/8BBEA4A5147C727100C4ADB7.xcbaseline/Info.plist
bjectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme
bjectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme
bjectivec/README.md
bjectivec/Tests/GPBARCUnittestProtos.m
bjectivec/Tests/GPBArrayTests.m
bjectivec/Tests/GPBCodedInputStreamTests.m
bjectivec/Tests/GPBCodedOuputStreamTests.m
bjectivec/Tests/GPBConcurrencyTests.m
bjectivec/Tests/GPBDescriptorTests.m
bjectivec/Tests/GPBDictionaryTests+Bool.m
bjectivec/Tests/GPBDictionaryTests+Int32.m
bjectivec/Tests/GPBDictionaryTests+Int64.m
bjectivec/Tests/GPBDictionaryTests+String.m
bjectivec/Tests/GPBDictionaryTests+UInt32.m
bjectivec/Tests/GPBDictionaryTests+UInt64.m
bjectivec/Tests/GPBDictionaryTests.pddm
bjectivec/Tests/GPBMessageTests+Merge.m
bjectivec/Tests/GPBMessageTests+Runtime.m
bjectivec/Tests/GPBMessageTests+Serialization.m
bjectivec/Tests/GPBMessageTests.m
bjectivec/Tests/GPBObjectiveCPlusPlusTest.mm
bjectivec/Tests/GPBPerfTests.m
bjectivec/Tests/GPBSwiftTests.swift
bjectivec/Tests/GPBTestUtilities.h
bjectivec/Tests/GPBTestUtilities.m
bjectivec/Tests/GPBUnittestProtos.m
bjectivec/Tests/GPBUnknownFieldSetTest.m
bjectivec/Tests/GPBUtilitiesTests.m
bjectivec/Tests/GPBWellKnownTypesTest.m
bjectivec/Tests/GPBWireFormatTests.m
bjectivec/Tests/UnitTests-Bridging-Header.h
bjectivec/Tests/UnitTests-Info.plist
bjectivec/Tests/golden_message
bjectivec/Tests/golden_packed_fields_message
bjectivec/Tests/iOSTestHarness/AppDelegate.m
bjectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/Contents.json
bjectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad6.png
bjectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad6_2x.png
bjectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad7.png
bjectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad7_2x.png
bjectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone6.png
bjectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone6_2x.png
bjectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7_2x.png
bjectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7_3x.png
bjectivec/Tests/iOSTestHarness/Images.xcassets/LaunchImage.launchimage/Contents.json
bjectivec/Tests/iOSTestHarness/Info.plist
bjectivec/Tests/iOSTestHarness/LaunchScreen.xib
bjectivec/Tests/iOSTestHarness/en.lproj/InfoPlist.strings
bjectivec/Tests/text_format_map_unittest_data.txt
bjectivec/Tests/text_format_unittest_data.txt
bjectivec/Tests/unittest_cycle.proto
bjectivec/Tests/unittest_objc.proto
bjectivec/Tests/unittest_objc_startup.proto
bjectivec/Tests/unittest_runtime_proto2.proto
bjectivec/Tests/unittest_runtime_proto3.proto
bjectivec/generate_well_known_types.sh
bjectivec/google/protobuf/Any.pbobjc.h
bjectivec/google/protobuf/Any.pbobjc.m
bjectivec/google/protobuf/Api.pbobjc.h
bjectivec/google/protobuf/Api.pbobjc.m
bjectivec/google/protobuf/Duration.pbobjc.h
bjectivec/google/protobuf/Duration.pbobjc.m
bjectivec/google/protobuf/Empty.pbobjc.h
bjectivec/google/protobuf/Empty.pbobjc.m
bjectivec/google/protobuf/FieldMask.pbobjc.h
bjectivec/google/protobuf/FieldMask.pbobjc.m
bjectivec/google/protobuf/SourceContext.pbobjc.h
bjectivec/google/protobuf/SourceContext.pbobjc.m
bjectivec/google/protobuf/Struct.pbobjc.h
bjectivec/google/protobuf/Struct.pbobjc.m
bjectivec/google/protobuf/Timestamp.pbobjc.h
bjectivec/google/protobuf/Timestamp.pbobjc.m
bjectivec/google/protobuf/Type.pbobjc.h
bjectivec/google/protobuf/Type.pbobjc.m
bjectivec/google/protobuf/Wrappers.pbobjc.h
bjectivec/google/protobuf/Wrappers.pbobjc.m
hp/ext/google/protobuf/config.m4
hp/ext/google/protobuf/def.c
hp/ext/google/protobuf/message.c
hp/ext/google/protobuf/protobuf.c
hp/ext/google/protobuf/protobuf.h
hp/ext/google/protobuf/storage.c
hp/ext/google/protobuf/test.php
hp/ext/google/protobuf/upb.c
hp/ext/google/protobuf/upb.h
hp/tests/autoload.php
ost_process_dist.sh
rotobuf-lite.pc.in
rotobuf.bzl
rotobuf.pc.in
rotoc-artifacts/Dockerfile
rotoc-artifacts/README.md
rotoc-artifacts/build-protoc.sh
rotoc-artifacts/pom.xml
ython/MANIFEST.in
ython/README.md
ython/README.txt
ython/ez_setup.py
ython/google/__init__.py
ython/google/protobuf/__init__.py
ython/google/protobuf/descriptor.py
ython/google/protobuf/descriptor_database.py
ython/google/protobuf/descriptor_pool.py
ython/google/protobuf/internal/_parameterized.py
ython/google/protobuf/internal/any_test.proto
ython/google/protobuf/internal/api_implementation.cc
ython/google/protobuf/internal/api_implementation.py
ython/google/protobuf/internal/api_implementation_default_test.py
ython/google/protobuf/internal/containers.py
ython/google/protobuf/internal/cpp_message.py
ython/google/protobuf/internal/decoder.py
ython/google/protobuf/internal/descriptor_database_test.py
ython/google/protobuf/internal/descriptor_pool_test.py
ython/google/protobuf/internal/descriptor_pool_test1.proto
ython/google/protobuf/internal/descriptor_pool_test2.proto
ython/google/protobuf/internal/descriptor_python_test.py
ython/google/protobuf/internal/descriptor_test.py
ython/google/protobuf/internal/encoder.py
ython/google/protobuf/internal/factory_test1.proto
ython/google/protobuf/internal/factory_test2.proto
ython/google/protobuf/internal/generator_test.py
ython/google/protobuf/internal/import_test_package/__init__.py
ython/google/protobuf/internal/import_test_package/inner.proto
ython/google/protobuf/internal/import_test_package/outer.proto
ython/google/protobuf/internal/json_format_test.py
ython/google/protobuf/internal/message_factory_python_test.py
ython/google/protobuf/internal/message_factory_test.py
ython/google/protobuf/internal/message_python_test.py
ython/google/protobuf/internal/message_set_extensions.proto
ython/google/protobuf/internal/message_test.py
ython/google/protobuf/internal/missing_enum_values.proto
ython/google/protobuf/internal/more_extensions.proto
ython/google/protobuf/internal/more_extensions_dynamic.proto
ython/google/protobuf/internal/more_messages.proto
ython/google/protobuf/internal/packed_field_test.proto
ython/google/protobuf/internal/proto_builder_test.py
ython/google/protobuf/internal/python_message.py
ython/google/protobuf/internal/reflection_test.py
ython/google/protobuf/internal/service_reflection_test.py
ython/google/protobuf/internal/symbol_database_test.py
ython/google/protobuf/internal/test_bad_identifiers.proto
ython/google/protobuf/internal/test_util.py
ython/google/protobuf/internal/text_encoding_test.py
ython/google/protobuf/internal/text_format_test.py
ython/google/protobuf/internal/type_checkers.py
ython/google/protobuf/internal/unknown_fields_test.py
ython/google/protobuf/internal/well_known_types.py
ython/google/protobuf/internal/well_known_types_test.py
ython/google/protobuf/internal/wire_format_test.py
ython/google/protobuf/json_format.py
ython/google/protobuf/message.py
ython/google/protobuf/message_factory.py
ython/google/protobuf/proto_builder.py
ython/google/protobuf/pyext/__init__.py
ython/google/protobuf/pyext/cpp_message.py
ython/google/protobuf/pyext/descriptor.cc
ython/google/protobuf/pyext/descriptor.h
ython/google/protobuf/pyext/descriptor_containers.cc
ython/google/protobuf/pyext/descriptor_containers.h
ython/google/protobuf/pyext/descriptor_cpp2_test.py
ython/google/protobuf/pyext/descriptor_database.cc
ython/google/protobuf/pyext/descriptor_database.h
ython/google/protobuf/pyext/descriptor_pool.cc
ython/google/protobuf/pyext/descriptor_pool.h
ython/google/protobuf/pyext/extension_dict.cc
ython/google/protobuf/pyext/extension_dict.h
ython/google/protobuf/pyext/map_container.cc
ython/google/protobuf/pyext/map_container.h
ython/google/protobuf/pyext/message.cc
ython/google/protobuf/pyext/message.h
ython/google/protobuf/pyext/message_factory_cpp2_test.py
ython/google/protobuf/pyext/proto2_api_test.proto
ython/google/protobuf/pyext/python.proto
ython/google/protobuf/pyext/reflection_cpp2_generated_test.py
ython/google/protobuf/pyext/repeated_composite_container.cc
ython/google/protobuf/pyext/repeated_composite_container.h
ython/google/protobuf/pyext/repeated_scalar_container.cc
ython/google/protobuf/pyext/repeated_scalar_container.h
ython/google/protobuf/pyext/scoped_pyobject_ptr.h
ython/google/protobuf/reflection.py
ython/google/protobuf/symbol_database.py
ython/google/protobuf/text_encoding.py
ython/google/protobuf/text_format.py
ython/mox.py
ython/setup.py
ython/tox.ini
uby/.gitignore
uby/Gemfile
uby/Gemfile.lock
uby/README.md
uby/Rakefile
uby/ext/google/protobuf_c/defs.c
uby/ext/google/protobuf_c/encode_decode.c
uby/ext/google/protobuf_c/extconf.rb
uby/ext/google/protobuf_c/map.c
uby/ext/google/protobuf_c/message.c
uby/ext/google/protobuf_c/protobuf.c
uby/ext/google/protobuf_c/protobuf.h
uby/ext/google/protobuf_c/repeated_field.c
uby/ext/google/protobuf_c/storage.c
uby/ext/google/protobuf_c/upb.c
uby/ext/google/protobuf_c/upb.h
uby/google-protobuf.gemspec
uby/lib/google/protobuf.rb
uby/lib/google/protobuf/message_exts.rb
uby/lib/google/protobuf/repeated_field.rb
uby/pom.xml
uby/src/main/java/com/google/protobuf/jruby/RubyBuilder.java
uby/src/main/java/com/google/protobuf/jruby/RubyDescriptor.java
uby/src/main/java/com/google/protobuf/jruby/RubyDescriptorPool.java
uby/src/main/java/com/google/protobuf/jruby/RubyEnum.java
uby/src/main/java/com/google/protobuf/jruby/RubyEnumBuilderContext.java
uby/src/main/java/com/google/protobuf/jruby/RubyEnumDescriptor.java
uby/src/main/java/com/google/protobuf/jruby/RubyFieldDescriptor.java
uby/src/main/java/com/google/protobuf/jruby/RubyMap.java
uby/src/main/java/com/google/protobuf/jruby/RubyMessage.java
uby/src/main/java/com/google/protobuf/jruby/RubyMessageBuilderContext.java
uby/src/main/java/com/google/protobuf/jruby/RubyOneofBuilderContext.java
uby/src/main/java/com/google/protobuf/jruby/RubyOneofDescriptor.java
uby/src/main/java/com/google/protobuf/jruby/RubyProtobuf.java
uby/src/main/java/com/google/protobuf/jruby/RubyRepeatedField.java
uby/src/main/java/com/google/protobuf/jruby/SentinelOuterClass.java
uby/src/main/java/com/google/protobuf/jruby/Utils.java
uby/src/main/java/google/ProtobufJavaService.java
uby/src/main/sentinel.proto
uby/tests/basic.rb
uby/tests/generated_code.proto
uby/tests/generated_code_test.rb
uby/tests/repeated_field_test.rb
uby/tests/stress.rb
uby/travis-test.sh
ix.BUILD
rc/Makefile.am
rc/Makefile.in
rc/README.md
rc/google/protobuf/SEBS
rc/google/protobuf/any.cc
rc/google/protobuf/any.h
rc/google/protobuf/any.pb.cc
rc/google/protobuf/any.pb.h
rc/google/protobuf/any.proto
rc/google/protobuf/any_test.cc
rc/google/protobuf/any_test.proto
rc/google/protobuf/api.pb.cc
rc/google/protobuf/api.pb.h
rc/google/protobuf/api.proto
rc/google/protobuf/arena.cc
rc/google/protobuf/arena.h
rc/google/protobuf/arena_nc.cc
rc/google/protobuf/arena_nc_test.py
rc/google/protobuf/arena_test_util.cc
rc/google/protobuf/arena_test_util.h
rc/google/protobuf/arena_unittest.cc
rc/google/protobuf/arenastring.cc
rc/google/protobuf/arenastring.h
rc/google/protobuf/arenastring_unittest.cc
rc/google/protobuf/compiler/code_generator.cc
rc/google/protobuf/compiler/code_generator.h
rc/google/protobuf/compiler/command_line_interface.cc
rc/google/protobuf/compiler/command_line_interface.h
rc/google/protobuf/compiler/command_line_interface_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_enum.cc
rc/google/protobuf/compiler/cpp/cpp_enum.h
rc/google/protobuf/compiler/cpp/cpp_enum_field.cc
rc/google/protobuf/compiler/cpp/cpp_enum_field.h
rc/google/protobuf/compiler/cpp/cpp_extension.cc
rc/google/protobuf/compiler/cpp/cpp_extension.h
rc/google/protobuf/compiler/cpp/cpp_field.cc
rc/google/protobuf/compiler/cpp/cpp_field.h
rc/google/protobuf/compiler/cpp/cpp_file.cc
rc/google/protobuf/compiler/cpp/cpp_file.h
rc/google/protobuf/compiler/cpp/cpp_generator.cc
rc/google/protobuf/compiler/cpp/cpp_helpers.cc
rc/google/protobuf/compiler/cpp/cpp_helpers.h
rc/google/protobuf/compiler/cpp/cpp_map_field.cc
rc/google/protobuf/compiler/cpp/cpp_map_field.h
rc/google/protobuf/compiler/cpp/cpp_message.cc
rc/google/protobuf/compiler/cpp/cpp_message.h
rc/google/protobuf/compiler/cpp/cpp_message_field.cc
rc/google/protobuf/compiler/cpp/cpp_message_field.h
rc/google/protobuf/compiler/cpp/cpp_options.h
rc/google/protobuf/compiler/cpp/cpp_plugin_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_primitive_field.cc
rc/google/protobuf/compiler/cpp/cpp_primitive_field.h
rc/google/protobuf/compiler/cpp/cpp_service.cc
rc/google/protobuf/compiler/cpp/cpp_string_field.cc
rc/google/protobuf/compiler/cpp/cpp_string_field.h
rc/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto
rc/google/protobuf/compiler/cpp/cpp_test_large_enum_value.proto
rc/google/protobuf/compiler/cpp/cpp_unittest.cc
rc/google/protobuf/compiler/cpp/metadata_test.cc
rc/google/protobuf/compiler/csharp/csharp_doc_comment.cc
rc/google/protobuf/compiler/csharp/csharp_doc_comment.h
rc/google/protobuf/compiler/csharp/csharp_enum.cc
rc/google/protobuf/compiler/csharp/csharp_enum.h
rc/google/protobuf/compiler/csharp/csharp_enum_field.cc
rc/google/protobuf/compiler/csharp/csharp_enum_field.h
rc/google/protobuf/compiler/csharp/csharp_field_base.cc
rc/google/protobuf/compiler/csharp/csharp_field_base.h
rc/google/protobuf/compiler/csharp/csharp_generator.cc
rc/google/protobuf/compiler/csharp/csharp_generator.h
rc/google/protobuf/compiler/csharp/csharp_generator_unittest.cc
rc/google/protobuf/compiler/csharp/csharp_helpers.cc
rc/google/protobuf/compiler/csharp/csharp_helpers.h
rc/google/protobuf/compiler/csharp/csharp_map_field.cc
rc/google/protobuf/compiler/csharp/csharp_map_field.h
rc/google/protobuf/compiler/csharp/csharp_message.cc
rc/google/protobuf/compiler/csharp/csharp_message.h
rc/google/protobuf/compiler/csharp/csharp_message_field.cc
rc/google/protobuf/compiler/csharp/csharp_message_field.h
rc/google/protobuf/compiler/csharp/csharp_names.h
rc/google/protobuf/compiler/csharp/csharp_options.h
rc/google/protobuf/compiler/csharp/csharp_primitive_field.cc
rc/google/protobuf/compiler/csharp/csharp_primitive_field.h
rc/google/protobuf/compiler/csharp/csharp_reflection_class.cc
rc/google/protobuf/compiler/csharp/csharp_reflection_class.h
rc/google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc
rc/google/protobuf/compiler/csharp/csharp_repeated_enum_field.h
rc/google/protobuf/compiler/csharp/csharp_repeated_message_field.cc
rc/google/protobuf/compiler/csharp/csharp_repeated_message_field.h
rc/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc
rc/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.h
rc/google/protobuf/compiler/csharp/csharp_source_generator_base.cc
rc/google/protobuf/compiler/csharp/csharp_source_generator_base.h
rc/google/protobuf/compiler/csharp/csharp_wrapper_field.cc
rc/google/protobuf/compiler/csharp/csharp_wrapper_field.h
rc/google/protobuf/compiler/importer.cc
rc/google/protobuf/compiler/importer.h
rc/google/protobuf/compiler/importer_unittest.cc
rc/google/protobuf/compiler/java/java_context.cc
rc/google/protobuf/compiler/java/java_context.h
rc/google/protobuf/compiler/java/java_doc_comment.cc
rc/google/protobuf/compiler/java/java_enum.cc
rc/google/protobuf/compiler/java/java_enum_field.cc
rc/google/protobuf/compiler/java/java_enum_field.h
rc/google/protobuf/compiler/java/java_enum_field_lite.cc
rc/google/protobuf/compiler/java/java_enum_field_lite.h
rc/google/protobuf/compiler/java/java_enum_lite.cc
rc/google/protobuf/compiler/java/java_enum_lite.h
rc/google/protobuf/compiler/java/java_extension.cc
rc/google/protobuf/compiler/java/java_extension.h
rc/google/protobuf/compiler/java/java_extension_lite.cc
rc/google/protobuf/compiler/java/java_extension_lite.h
rc/google/protobuf/compiler/java/java_field.cc
rc/google/protobuf/compiler/java/java_field.h
rc/google/protobuf/compiler/java/java_file.cc
rc/google/protobuf/compiler/java/java_file.h
rc/google/protobuf/compiler/java/java_generator.cc
rc/google/protobuf/compiler/java/java_generator_factory.cc
rc/google/protobuf/compiler/java/java_helpers.cc
rc/google/protobuf/compiler/java/java_helpers.h
rc/google/protobuf/compiler/java/java_lazy_message_field.cc
rc/google/protobuf/compiler/java/java_lazy_message_field_lite.cc
rc/google/protobuf/compiler/java/java_lazy_message_field_lite.h
rc/google/protobuf/compiler/java/java_map_field.cc
rc/google/protobuf/compiler/java/java_map_field.h
rc/google/protobuf/compiler/java/java_map_field_lite.cc
rc/google/protobuf/compiler/java/java_map_field_lite.h
rc/google/protobuf/compiler/java/java_message.cc
rc/google/protobuf/compiler/java/java_message.h
rc/google/protobuf/compiler/java/java_message_builder.cc
rc/google/protobuf/compiler/java/java_message_builder.h
rc/google/protobuf/compiler/java/java_message_builder_lite.cc
rc/google/protobuf/compiler/java/java_message_builder_lite.h
rc/google/protobuf/compiler/java/java_message_field.cc
rc/google/protobuf/compiler/java/java_message_field_lite.cc
rc/google/protobuf/compiler/java/java_message_field_lite.h
rc/google/protobuf/compiler/java/java_message_lite.cc
rc/google/protobuf/compiler/java/java_message_lite.h
rc/google/protobuf/compiler/java/java_name_resolver.cc
rc/google/protobuf/compiler/java/java_name_resolver.h
rc/google/protobuf/compiler/java/java_names.h
rc/google/protobuf/compiler/java/java_plugin_unittest.cc
rc/google/protobuf/compiler/java/java_primitive_field.cc
rc/google/protobuf/compiler/java/java_primitive_field_lite.cc
rc/google/protobuf/compiler/java/java_primitive_field_lite.h
rc/google/protobuf/compiler/java/java_service.cc
rc/google/protobuf/compiler/java/java_shared_code_generator.cc
rc/google/protobuf/compiler/java/java_shared_code_generator.h
rc/google/protobuf/compiler/java/java_string_field.cc
rc/google/protobuf/compiler/java/java_string_field.h
rc/google/protobuf/compiler/java/java_string_field_lite.cc
rc/google/protobuf/compiler/java/java_string_field_lite.h
rc/google/protobuf/compiler/javanano/javanano_enum.h
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_enum_field.h
rc/google/protobuf/compiler/javanano/javanano_extension.h
rc/google/protobuf/compiler/javanano/javanano_field.cc
rc/google/protobuf/compiler/javanano/javanano_field.h
rc/google/protobuf/compiler/javanano/javanano_file.cc
rc/google/protobuf/compiler/javanano/javanano_file.h
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_generator.h
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.h
rc/google/protobuf/compiler/javanano/javanano_map_field.cc
rc/google/protobuf/compiler/javanano/javanano_map_field.h
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_message.h
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.h
rc/google/protobuf/compiler/javanano/javanano_params.h
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.h
rc/google/protobuf/compiler/js/js_generator.cc
rc/google/protobuf/compiler/js/js_generator.h
rc/google/protobuf/compiler/main.cc
rc/google/protobuf/compiler/mock_code_generator.cc
rc/google/protobuf/compiler/mock_code_generator.h
rc/google/protobuf/compiler/objectivec/objectivec_enum.cc
rc/google/protobuf/compiler/objectivec/objectivec_enum.h
rc/google/protobuf/compiler/objectivec/objectivec_enum_field.cc
rc/google/protobuf/compiler/objectivec/objectivec_enum_field.h
rc/google/protobuf/compiler/objectivec/objectivec_extension.cc
rc/google/protobuf/compiler/objectivec/objectivec_extension.h
rc/google/protobuf/compiler/objectivec/objectivec_field.cc
rc/google/protobuf/compiler/objectivec/objectivec_field.h
rc/google/protobuf/compiler/objectivec/objectivec_file.cc
rc/google/protobuf/compiler/objectivec/objectivec_file.h
rc/google/protobuf/compiler/objectivec/objectivec_generator.cc
rc/google/protobuf/compiler/objectivec/objectivec_generator.h
rc/google/protobuf/compiler/objectivec/objectivec_helpers.cc
rc/google/protobuf/compiler/objectivec/objectivec_helpers.h
rc/google/protobuf/compiler/objectivec/objectivec_helpers_unittest.cc
rc/google/protobuf/compiler/objectivec/objectivec_map_field.cc
rc/google/protobuf/compiler/objectivec/objectivec_map_field.h
rc/google/protobuf/compiler/objectivec/objectivec_message.cc
rc/google/protobuf/compiler/objectivec/objectivec_message.h
rc/google/protobuf/compiler/objectivec/objectivec_message_field.cc
rc/google/protobuf/compiler/objectivec/objectivec_message_field.h
rc/google/protobuf/compiler/objectivec/objectivec_oneof.cc
rc/google/protobuf/compiler/objectivec/objectivec_oneof.h
rc/google/protobuf/compiler/objectivec/objectivec_primitive_field.cc
rc/google/protobuf/compiler/objectivec/objectivec_primitive_field.h
rc/google/protobuf/compiler/parser.cc
rc/google/protobuf/compiler/parser.h
rc/google/protobuf/compiler/parser_unittest.cc
rc/google/protobuf/compiler/plugin.cc
rc/google/protobuf/compiler/plugin.h
rc/google/protobuf/compiler/plugin.pb.cc
rc/google/protobuf/compiler/plugin.pb.h
rc/google/protobuf/compiler/plugin.proto
rc/google/protobuf/compiler/python/python_generator.cc
rc/google/protobuf/compiler/python/python_generator.h
rc/google/protobuf/compiler/python/python_plugin_unittest.cc
rc/google/protobuf/compiler/ruby/ruby_generated_code.proto
rc/google/protobuf/compiler/ruby/ruby_generated_code.rb
rc/google/protobuf/compiler/ruby/ruby_generator.cc
rc/google/protobuf/compiler/ruby/ruby_generator.h
rc/google/protobuf/compiler/ruby/ruby_generator_unittest.cc
rc/google/protobuf/compiler/subprocess.cc
rc/google/protobuf/descriptor.cc
rc/google/protobuf/descriptor.h
rc/google/protobuf/descriptor.pb.cc
rc/google/protobuf/descriptor.pb.h
rc/google/protobuf/descriptor.proto
rc/google/protobuf/descriptor_database.cc
rc/google/protobuf/descriptor_database.h
rc/google/protobuf/descriptor_database_unittest.cc
rc/google/protobuf/descriptor_pb2_test.py
rc/google/protobuf/descriptor_unittest.cc
rc/google/protobuf/drop_unknown_fields_test.cc
rc/google/protobuf/duration.pb.cc
rc/google/protobuf/duration.pb.h
rc/google/protobuf/duration.proto
rc/google/protobuf/dynamic_message.cc
rc/google/protobuf/dynamic_message.h
rc/google/protobuf/dynamic_message_unittest.cc
rc/google/protobuf/empty.pb.cc
rc/google/protobuf/empty.pb.h
rc/google/protobuf/empty.proto
rc/google/protobuf/extension_set.cc
rc/google/protobuf/extension_set.h
rc/google/protobuf/extension_set_heavy.cc
rc/google/protobuf/extension_set_unittest.cc
rc/google/protobuf/field_mask.pb.cc
rc/google/protobuf/field_mask.pb.h
rc/google/protobuf/field_mask.proto
rc/google/protobuf/generated_enum_reflection.h
rc/google/protobuf/generated_enum_util.h
rc/google/protobuf/generated_message_reflection.cc
rc/google/protobuf/generated_message_reflection.h
rc/google/protobuf/generated_message_reflection_unittest.cc
rc/google/protobuf/generated_message_util.cc
rc/google/protobuf/generated_message_util.h
rc/google/protobuf/io/coded_stream.cc
rc/google/protobuf/io/coded_stream.h
rc/google/protobuf/io/coded_stream_inl.h
rc/google/protobuf/io/coded_stream_unittest.cc
rc/google/protobuf/io/gzip_stream.cc
rc/google/protobuf/io/gzip_stream.h
rc/google/protobuf/io/printer.cc
rc/google/protobuf/io/printer.h
rc/google/protobuf/io/printer_unittest.cc
rc/google/protobuf/io/strtod.cc
rc/google/protobuf/io/strtod.h
rc/google/protobuf/io/tokenizer.cc
rc/google/protobuf/io/tokenizer.h
rc/google/protobuf/io/tokenizer_unittest.cc
rc/google/protobuf/io/zero_copy_stream.cc
rc/google/protobuf/io/zero_copy_stream_impl.cc
rc/google/protobuf/io/zero_copy_stream_impl_lite.cc
rc/google/protobuf/io/zero_copy_stream_impl_lite.h
rc/google/protobuf/io/zero_copy_stream_unittest.cc
rc/google/protobuf/lite_arena_unittest.cc
rc/google/protobuf/lite_unittest.cc
rc/google/protobuf/map.h
rc/google/protobuf/map_entry.h
rc/google/protobuf/map_entry_lite.h
rc/google/protobuf/map_field.cc
rc/google/protobuf/map_field.h
rc/google/protobuf/map_field_inl.h
rc/google/protobuf/map_field_lite.h
rc/google/protobuf/map_field_test.cc
rc/google/protobuf/map_lite_test_util.cc
rc/google/protobuf/map_lite_test_util.h
rc/google/protobuf/map_lite_unittest.proto
rc/google/protobuf/map_proto2_unittest.proto
rc/google/protobuf/map_test.cc
rc/google/protobuf/map_test_util.cc
rc/google/protobuf/map_test_util.h
rc/google/protobuf/map_test_util_impl.h
rc/google/protobuf/map_type_handler.h
rc/google/protobuf/map_unittest.proto
rc/google/protobuf/map_unittest_proto3.proto
rc/google/protobuf/message.cc
rc/google/protobuf/message.h
rc/google/protobuf/message_lite.cc
rc/google/protobuf/message_lite.h
rc/google/protobuf/message_unittest.cc
rc/google/protobuf/metadata.h
rc/google/protobuf/no_field_presence_test.cc
rc/google/protobuf/preserve_unknown_enum_test.cc
rc/google/protobuf/proto3_arena_lite_unittest.cc
rc/google/protobuf/proto3_arena_unittest.cc
rc/google/protobuf/proto3_lite_unittest.cc
rc/google/protobuf/reflection.h
rc/google/protobuf/reflection_internal.h
rc/google/protobuf/reflection_ops_unittest.cc
rc/google/protobuf/repeated_field.cc
rc/google/protobuf/repeated_field.h
rc/google/protobuf/repeated_field_reflection.h
rc/google/protobuf/repeated_field_reflection_unittest.cc
rc/google/protobuf/repeated_field_unittest.cc
rc/google/protobuf/service.h
rc/google/protobuf/source_context.pb.cc
rc/google/protobuf/source_context.pb.h
rc/google/protobuf/source_context.proto
rc/google/protobuf/struct.pb.cc
rc/google/protobuf/struct.pb.h
rc/google/protobuf/struct.proto
rc/google/protobuf/stubs/atomic_sequence_num.h
rc/google/protobuf/stubs/atomicops.h
rc/google/protobuf/stubs/atomicops_internals_generic_gcc.h
rc/google/protobuf/stubs/atomicops_internals_mips_gcc.h
rc/google/protobuf/stubs/atomicops_internals_pnacl.h
rc/google/protobuf/stubs/atomicops_internals_power.h
rc/google/protobuf/stubs/atomicops_internals_ppc_gcc.h
rc/google/protobuf/stubs/bytestream.cc
rc/google/protobuf/stubs/bytestream.h
rc/google/protobuf/stubs/bytestream_unittest.cc
rc/google/protobuf/stubs/callback.h
rc/google/protobuf/stubs/casts.h
rc/google/protobuf/stubs/common.cc
rc/google/protobuf/stubs/common.h
rc/google/protobuf/stubs/common_unittest.cc
rc/google/protobuf/stubs/fastmem.h
rc/google/protobuf/stubs/hash.cc
rc/google/protobuf/stubs/hash.h
rc/google/protobuf/stubs/int128.cc
rc/google/protobuf/stubs/int128.h
rc/google/protobuf/stubs/int128_unittest.cc
rc/google/protobuf/stubs/logging.h
rc/google/protobuf/stubs/macros.h
rc/google/protobuf/stubs/map-util.h
rc/google/protobuf/stubs/map_util.h
rc/google/protobuf/stubs/mathlimits.cc
rc/google/protobuf/stubs/mathlimits.h
rc/google/protobuf/stubs/mathutil.h
rc/google/protobuf/stubs/mutex.h
rc/google/protobuf/stubs/once.h
rc/google/protobuf/stubs/once_unittest.cc
rc/google/protobuf/stubs/platform_macros.h
rc/google/protobuf/stubs/port.h
rc/google/protobuf/stubs/scoped_ptr.h
rc/google/protobuf/stubs/singleton.h
rc/google/protobuf/stubs/status.cc
rc/google/protobuf/stubs/status.h
rc/google/protobuf/stubs/status_macros.h
rc/google/protobuf/stubs/status_test.cc
rc/google/protobuf/stubs/statusor.cc
rc/google/protobuf/stubs/statusor.h
rc/google/protobuf/stubs/statusor_test.cc
rc/google/protobuf/stubs/stl_util-inl.h
rc/google/protobuf/stubs/stringpiece.cc
rc/google/protobuf/stubs/stringpiece.h
rc/google/protobuf/stubs/stringpiece_unittest.cc
rc/google/protobuf/stubs/stringprintf.cc
rc/google/protobuf/stubs/structurally_valid.cc
rc/google/protobuf/stubs/strutil.cc
rc/google/protobuf/stubs/strutil.h
rc/google/protobuf/stubs/strutil_unittest.cc
rc/google/protobuf/stubs/template_util.h
rc/google/protobuf/stubs/time.cc
rc/google/protobuf/stubs/time.h
rc/google/protobuf/stubs/time_test.cc
rc/google/protobuf/stubs/type_traits.h
rc/google/protobuf/stubs/type_traits_unittest.cc
rc/google/protobuf/test_util.cc
rc/google/protobuf/test_util.h
rc/google/protobuf/test_util_lite.cc
rc/google/protobuf/test_util_lite.h
rc/google/protobuf/testdata/golden_message_proto3
rc/google/protobuf/testdata/map_test_data.txt
rc/google/protobuf/testing/file.cc
rc/google/protobuf/testing/file.h
rc/google/protobuf/testing/googletest.cc
rc/google/protobuf/testing/zcgunzip.cc
rc/google/protobuf/testing/zcgzip.cc
rc/google/protobuf/text_format.cc
rc/google/protobuf/text_format.h
rc/google/protobuf/text_format_unittest.cc
rc/google/protobuf/timestamp.pb.cc
rc/google/protobuf/timestamp.pb.h
rc/google/protobuf/timestamp.proto
rc/google/protobuf/type.pb.cc
rc/google/protobuf/type.pb.h
rc/google/protobuf/type.proto
rc/google/protobuf/unittest.proto
rc/google/protobuf/unittest_accessors_nano.proto
rc/google/protobuf/unittest_arena.proto
rc/google/protobuf/unittest_bytes_offset_length_nano.proto
rc/google/protobuf/unittest_custom_options.proto
rc/google/protobuf/unittest_drop_unknown_fields.proto
rc/google/protobuf/unittest_embed_optimize_for.proto
rc/google/protobuf/unittest_empty.proto
rc/google/protobuf/unittest_enormous_descriptor.proto
rc/google/protobuf/unittest_enum_class_multiple_nano.proto
rc/google/protobuf/unittest_enum_class_nano.proto
rc/google/protobuf/unittest_enum_validity_nano.proto
rc/google/protobuf/unittest_extension_nano.proto
rc/google/protobuf/unittest_extension_packed_nano.proto
rc/google/protobuf/unittest_extension_repeated_nano.proto
rc/google/protobuf/unittest_extension_singular_nano.proto
rc/google/protobuf/unittest_has_nano.proto
rc/google/protobuf/unittest_import.proto
rc/google/protobuf/unittest_import_lite.proto
rc/google/protobuf/unittest_import_micro.proto
rc/google/protobuf/unittest_import_nano.proto
rc/google/protobuf/unittest_import_proto3.proto
rc/google/protobuf/unittest_import_public.proto
rc/google/protobuf/unittest_import_public_lite.proto
rc/google/protobuf/unittest_import_public_proto3.proto
rc/google/protobuf/unittest_lite.proto
rc/google/protobuf/unittest_lite_imports_nonlite.proto
rc/google/protobuf/unittest_micro.proto
rc/google/protobuf/unittest_mset.proto
rc/google/protobuf/unittest_mset_wire_format.proto
rc/google/protobuf/unittest_multiple_micro.proto
rc/google/protobuf/unittest_multiple_nameclash_micro.proto
rc/google/protobuf/unittest_multiple_nameclash_nano.proto
rc/google/protobuf/unittest_multiple_nano.proto
rc/google/protobuf/unittest_nano.proto
rc/google/protobuf/unittest_no_arena.proto
rc/google/protobuf/unittest_no_arena_import.proto
rc/google/protobuf/unittest_no_arena_lite.proto
rc/google/protobuf/unittest_no_field_presence.proto
rc/google/protobuf/unittest_no_generic_services.proto
rc/google/protobuf/unittest_optimize_for.proto
rc/google/protobuf/unittest_preserve_unknown_enum.proto
rc/google/protobuf/unittest_preserve_unknown_enum2.proto
rc/google/protobuf/unittest_proto3.proto
rc/google/protobuf/unittest_proto3_arena.proto
rc/google/protobuf/unittest_proto3_arena_lite.proto
rc/google/protobuf/unittest_proto3_lite.proto
rc/google/protobuf/unittest_recursive_micro.proto
rc/google/protobuf/unittest_recursive_nano.proto
rc/google/protobuf/unittest_reference_types_nano.proto
rc/google/protobuf/unittest_repeated_merge_nano.proto
rc/google/protobuf/unittest_repeated_packables_nano.proto
rc/google/protobuf/unittest_simple_micro.proto
rc/google/protobuf/unittest_simple_nano.proto
rc/google/protobuf/unittest_single_micro.proto
rc/google/protobuf/unittest_single_nano.proto
rc/google/protobuf/unittest_stringutf8_micro.proto
rc/google/protobuf/unittest_stringutf8_nano.proto
rc/google/protobuf/unittest_unknown_enum_values_nano.proto
rc/google/protobuf/unittest_well_known_types.proto
rc/google/protobuf/unknown_field_set.cc
rc/google/protobuf/unknown_field_set.h
rc/google/protobuf/unknown_field_set_unittest.cc
rc/google/protobuf/util/field_comparator.cc
rc/google/protobuf/util/field_comparator.h
rc/google/protobuf/util/field_comparator_test.cc
rc/google/protobuf/util/field_mask_util.cc
rc/google/protobuf/util/field_mask_util.h
rc/google/protobuf/util/field_mask_util_test.cc
rc/google/protobuf/util/internal/constants.h
rc/google/protobuf/util/internal/datapiece.cc
rc/google/protobuf/util/internal/datapiece.h
rc/google/protobuf/util/internal/default_value_objectwriter.cc
rc/google/protobuf/util/internal/default_value_objectwriter.h
rc/google/protobuf/util/internal/default_value_objectwriter_test.cc
rc/google/protobuf/util/internal/error_listener.cc
rc/google/protobuf/util/internal/error_listener.h
rc/google/protobuf/util/internal/expecting_objectwriter.h
rc/google/protobuf/util/internal/field_mask_utility.cc
rc/google/protobuf/util/internal/field_mask_utility.h
rc/google/protobuf/util/internal/json_escaping.cc
rc/google/protobuf/util/internal/json_escaping.h
rc/google/protobuf/util/internal/json_objectwriter.cc
rc/google/protobuf/util/internal/json_objectwriter.h
rc/google/protobuf/util/internal/json_objectwriter_test.cc
rc/google/protobuf/util/internal/json_stream_parser.cc
rc/google/protobuf/util/internal/json_stream_parser.h
rc/google/protobuf/util/internal/json_stream_parser_test.cc
rc/google/protobuf/util/internal/location_tracker.h
rc/google/protobuf/util/internal/mock_error_listener.h
rc/google/protobuf/util/internal/object_location_tracker.h
rc/google/protobuf/util/internal/object_source.h
rc/google/protobuf/util/internal/object_writer.cc
rc/google/protobuf/util/internal/object_writer.h
rc/google/protobuf/util/internal/proto_writer.cc
rc/google/protobuf/util/internal/proto_writer.h
rc/google/protobuf/util/internal/protostream_objectsource.cc
rc/google/protobuf/util/internal/protostream_objectsource.h
rc/google/protobuf/util/internal/protostream_objectsource_test.cc
rc/google/protobuf/util/internal/protostream_objectwriter.cc
rc/google/protobuf/util/internal/protostream_objectwriter.h
rc/google/protobuf/util/internal/protostream_objectwriter_test.cc
rc/google/protobuf/util/internal/structured_objectwriter.h
rc/google/protobuf/util/internal/testdata/anys.proto
rc/google/protobuf/util/internal/testdata/books.proto
rc/google/protobuf/util/internal/testdata/default_value.proto
rc/google/protobuf/util/internal/testdata/default_value_test.proto
rc/google/protobuf/util/internal/testdata/field_mask.proto
rc/google/protobuf/util/internal/testdata/maps.proto
rc/google/protobuf/util/internal/testdata/oneofs.proto
rc/google/protobuf/util/internal/testdata/struct.proto
rc/google/protobuf/util/internal/testdata/timestamp_duration.proto
rc/google/protobuf/util/internal/testdata/wrappers.proto
rc/google/protobuf/util/internal/type_info.cc
rc/google/protobuf/util/internal/type_info.h
rc/google/protobuf/util/internal/type_info_test_helper.cc
rc/google/protobuf/util/internal/type_info_test_helper.h
rc/google/protobuf/util/internal/utility.cc
rc/google/protobuf/util/internal/utility.h
rc/google/protobuf/util/json_format_proto3.proto
rc/google/protobuf/util/json_util.cc
rc/google/protobuf/util/json_util.h
rc/google/protobuf/util/json_util_test.cc
rc/google/protobuf/util/message_differencer.cc
rc/google/protobuf/util/message_differencer.h
rc/google/protobuf/util/message_differencer_unittest.cc
rc/google/protobuf/util/message_differencer_unittest.proto
rc/google/protobuf/util/time_util.cc
rc/google/protobuf/util/time_util.h
rc/google/protobuf/util/time_util_test.cc
rc/google/protobuf/util/type_resolver.h
rc/google/protobuf/util/type_resolver_util.cc
rc/google/protobuf/util/type_resolver_util.h
rc/google/protobuf/util/type_resolver_util_test.cc
rc/google/protobuf/well_known_types_unittest.cc
rc/google/protobuf/wire_format.cc
rc/google/protobuf/wire_format.h
rc/google/protobuf/wire_format_lite.cc
rc/google/protobuf/wire_format_lite.h
rc/google/protobuf/wire_format_lite_inl.h
rc/google/protobuf/wire_format_unittest.cc
rc/google/protobuf/wrappers.pb.cc
rc/google/protobuf/wrappers.pb.h
rc/google/protobuf/wrappers.proto
ests.sh
pdate_file_lists.sh
til/BUILD
til/CHANGES.txt
til/CONTRIBUTORS.txt
til/LICENSE
til/Makefile.am
til/Protobuf.podspec
til/README.md
til/WORKSPACE
til/appveyor.bat
til/appveyor.yml
til/autogen.sh
til/configure.ac
til/generate_descriptor_proto.sh
til/gmock.BUILD
til/post_process_dist.sh
til/protobuf-lite.pc.in
til/protobuf.bzl
til/protobuf.pc.in
til/python/BUILD
til/six.BUILD
til/tests.sh
til/update_file_lists.sh
sprojects/config.h
sprojects/convert2008to2005.sh
sprojects/extract_includes.bat
sprojects/libprotobuf-lite.vcproj
sprojects/libprotobuf.vcproj
sprojects/libprotoc.vcproj
sprojects/lite-test.vcproj
sprojects/protobuf.sln
sprojects/protoc.vcproj
sprojects/readme.txt
sprojects/test_plugin.vcproj
sprojects/tests.vcproj
9f183e211f11e0e5c0a1fa519107dbfbb1a8d4ca 07-Apr-2016 Adam Lesinski <adamlesinski@google.com> Build host libraries for Windows am: 5b009a8
am: ad2c83e

* commit 'ad2c83efca3d45b379effbee29f3f176de043b15':
Build host libraries for Windows

Change-Id: I81380e36ed949e44d155a2cbc4419f3130ce4fc8
ad2c83efca3d45b379effbee29f3f176de043b15 07-Apr-2016 Adam Lesinski <adamlesinski@google.com> Build host libraries for Windows
am: 5b009a8

* commit '5b009a8d3658b1e2374f2b2a730d42d50b2db898':
Build host libraries for Windows

Change-Id: I0e26669e87d4d0c101571c89f124e7c2faf0ae6d
5b009a8d3658b1e2374f2b2a730d42d50b2db898 07-Apr-2016 Adam Lesinski <adamlesinski@google.com> Build host libraries for Windows

Change-Id: I4f2eadf97a7d78cebfc0001a38f3c80750eac5fc
ndroid.mk
6555104c96ce9675adbccf91c04b8f63a6366d6d 11-Mar-2016 Adam Lesinski <adamlesinski@google.com> Add static c++ host target for host side tools
am: 8428b5dbaf

* commit '8428b5dbaf67dee7258290f5db6038fd3b7679da':
Add static c++ host target for host side tools
8428b5dbaf67dee7258290f5db6038fd3b7679da 11-Mar-2016 Adam Lesinski <adamlesinski@google.com> Add static c++ host target for host side tools

Change-Id: I8ce3190f61e7871c4bbf6d4ddaee6ea2bd8e583b
ndroid.mk
fd15ffde1438e0587d1dc46a5e7f6bb367b11d4e 09-Mar-2016 Jeff Davidson <jpd@google.com> Parse unknown enum values like full proto2. am: ae409fcc56
am: 72c867e548

* commit '72c867e5484fbabfa6c3296aba24410d20e1dfff':
Parse unknown enum values like full proto2.
a7a7c575068cd80527ac32a0737a6ab9cafa72be 09-Mar-2016 Jeff Davidson <jpd@google.com> Merge "Parse unknown enum values like full proto2."
am: 4b96538e77

* commit '4b96538e7732817c2eb667d9ab9380b30525e2c3':
Parse unknown enum values like full proto2.
72c867e5484fbabfa6c3296aba24410d20e1dfff 09-Mar-2016 Jeff Davidson <jpd@google.com> Parse unknown enum values like full proto2.
am: ae409fcc56

* commit 'ae409fcc56e34811fbfe394d86108ea8cca908e9':
Parse unknown enum values like full proto2.
4b96538e7732817c2eb667d9ab9380b30525e2c3 08-Mar-2016 Jeff Davidson <jpd@google.com> Merge "Parse unknown enum values like full proto2."
a8261e510af46b7c045ee7a4cc9ac732783b2ab4 08-Mar-2016 Jeff Davidson <jpd@google.com> Parse unknown enum values like full proto2.

Store unknown values in the unknown field set. For repeated fields,
store unknown values while leaving known values in place.

This can lead to some strange behaviors, such as new values not being
serialized (because the unknown field set copy comes second on the
wire), or the order of repeated fields changing (if the value is
serialized when the field is unknown, and deserialized later when it
becomes known). Having strange behavior be consistent with the
standard implementation is nonetheless better than diverging.

Bug: 26337187
Change-Id: I9fee24d05d387a46e15b07c7a8a97704b76b5f27
ava/pom.xml
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/unittest_unknown_enum_values_nano.proto
ae409fcc56e34811fbfe394d86108ea8cca908e9 08-Mar-2016 Jeff Davidson <jpd@google.com> Parse unknown enum values like full proto2.

Store unknown values in the unknown field set. For repeated fields,
store unknown values while leaving known values in place.

This can lead to some strange behaviors, such as new values not being
serialized (because the unknown field set copy comes second on the
wire), or the order of repeated fields changing (if the value is
serialized when the field is unknown, and deserialized later when it
becomes known). Having strange behavior be consistent with the
standard implementation is nonetheless better than diverging.

Bug: 26337187
Change-Id: I9fee24d05d387a46e15b07c7a8a97704b76b5f27
ava/pom.xml
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/unittest_unknown_enum_values_nano.proto
58961ce415318f251889c3af41d877f37fc09112 23-Feb-2016 Neil Fuller <nfuller@google.com> Merge "Force protobuf to continue to use v51 (1.7) .class files" am: 34ecb3269f
am: 26319298f1

* commit '26319298f187750969bae75869a033197c7e3472':
Force protobuf to continue to use v51 (1.7) .class files
26319298f187750969bae75869a033197c7e3472 23-Feb-2016 Neil Fuller <nfuller@google.com> Merge "Force protobuf to continue to use v51 (1.7) .class files"
am: 34ecb3269f

* commit '34ecb3269f3270c8745bbcb960a362973977e241':
Force protobuf to continue to use v51 (1.7) .class files
34ecb3269f3270c8745bbcb960a362973977e241 23-Feb-2016 Neil Fuller <nfuller@google.com> Merge "Force protobuf to continue to use v51 (1.7) .class files"
2c239f24b3057de53e8ceeb6d07f9716d78987b2 16-Feb-2016 Neil Fuller <nfuller@google.com> Force protobuf to continue to use v51 (1.7) .class files

The default is changing to v52 (1.8).

The build for this package uses jarjar to repackage .class files.

The version of jarjar in the Android tree does not currently
support v52 .class files.

Bug: 26753820
(cherry picked from commit 8e67c67896e167937fd7b05493a57df5f4f7c90f)

Change-Id: I9cd43f3a45fab904a42ae2510623457a6aa941fb
ndroid.mk
04fce3db7fe957214c12984d70bc50f45673df98 17-Feb-2016 Bill Yi <byi@google.com> Merge commit \'60afb8a18392ae9d891e20a1f4276c89b9781ed8\' into HEAD
am: b3f205527c

* commit 'b3f205527ce7adc42d98f664b264c1ee76a89946':
b3f205527ce7adc42d98f664b264c1ee76a89946 17-Feb-2016 Bill Yi <byi@google.com> Merge commit '60afb8a18392ae9d891e20a1f4276c89b9781ed8' into HEAD

Change-Id: I4ce99f3509fe653d51c2baf79d97b32eff6f2283
8e67c67896e167937fd7b05493a57df5f4f7c90f 16-Feb-2016 Neil Fuller <nfuller@google.com> Force protobuf to continue to use v51 (1.7) .class files

The default is changing to v52 (1.8).

The build for this package uses jarjar to repackage .class files.

The version of jarjar in the Android tree does not currently
support v52 .class files.

Bug: 26753820
Change-Id: I74fc1b24e38e745e79a5c89030c341a0c71ff8ae
ndroid.mk
802bd84e3a617af4a9f63fa51003af52b1cb6476 05-Feb-2016 Marie Janssen <jamuraa@google.com> resolve merge conflicts of 68879d8c1c to mnc-dr2-dev-plus-aosp.
am: e4127259dd

* commit 'e4127259dd2ab675d6af062ef338f978c835cf60':
Build libprotobuf-cpp-full for the host
e4127259dd2ab675d6af062ef338f978c835cf60 05-Feb-2016 Marie Janssen <jamuraa@google.com> resolve merge conflicts of 68879d8c1c to mnc-dr2-dev-plus-aosp.

Change-Id: I79663e376d9d5c9624e6ed0722c6c701a07cc784
68879d8c1cd2efe823bd6af4077090ee99b6d614 05-Feb-2016 Marie Janssen <jamuraa@google.com> Merge "Build libprotobuf-cpp-full for the host"
fcbf587bd0b203c64aa5996c31d81af3c1d2b44c 04-Feb-2016 Marie Janssen <jamuraa@google.com> Build libprotobuf-cpp-full for the host

This patch builds libprotobuf-cpp-full with and without rtti for the
host, using the same module names.

Enabling these allows us to have tests that duplicate each other on the
target and host machines which both use the full protobuf library.

Bug: 25691403
Change-Id: I373aa0c9bb126072d9c4dedb79380e896857b013
ndroid.mk
7e814a2da9a4cc878c741c3348a316fb4f74fe31 27-Jan-2016 Dan Willemsen <dwillemsen@google.com> Merge "Remove headers from LOCAL_SRC_FILES" am: 5a5fd5d133
am: c19c30dd96

* commit 'c19c30dd968dae654255cad8c70f083b06d28358':
Remove headers from LOCAL_SRC_FILES
c19c30dd968dae654255cad8c70f083b06d28358 26-Jan-2016 Dan Willemsen <dwillemsen@google.com> Merge "Remove headers from LOCAL_SRC_FILES"
am: 5a5fd5d133

* commit '5a5fd5d133377f4fe2c2df50e999f0cf9cd2add4':
Remove headers from LOCAL_SRC_FILES
5a5fd5d133377f4fe2c2df50e999f0cf9cd2add4 26-Jan-2016 Dan Willemsen <dwillemsen@google.com> Merge "Remove headers from LOCAL_SRC_FILES"
d572ec5fcd5733572a4cfb8d4e48b08ecb3f646b 25-Jan-2016 Dan Willemsen <dwillemsen@google.com> Remove headers from LOCAL_SRC_FILES

The build system does not use headers in LOCAL_SRC_FILES. To prevent
typos, it's becoming a warning to add something to LOCAL_SRC_FILES that
is not used.

Also removes commented out copies of LOCAL_COPY_HEADERS.
LOCAL_EXPORT_C_INCLUDE_DIRS should be (and is) used instead.

Change-Id: Ie59e2857abb0360481902e2b080b15fb75331aa9
ndroid.mk
a673817adee48d131ab3e52048a46f3fb65507d6 10-Dec-2015 Alex Deymo <deymo@google.com> Merge "Build libprotobuf-cpp-lite for the host." am: af9545b7f8
am: 60afb8a183

* commit '60afb8a18392ae9d891e20a1f4276c89b9781ed8':
Build libprotobuf-cpp-lite for the host.
60afb8a18392ae9d891e20a1f4276c89b9781ed8 10-Dec-2015 Alex Deymo <deymo@google.com> Merge "Build libprotobuf-cpp-lite for the host."
am: af9545b7f8

* commit 'af9545b7f83e470eab55b6773dc71d847ddab9c6':
Build libprotobuf-cpp-lite for the host.
af9545b7f83e470eab55b6773dc71d847ddab9c6 10-Dec-2015 Alex Deymo <deymo@google.com> Merge "Build libprotobuf-cpp-lite for the host."
4026c6867fa5df7a9acd9299b6d67ca2b0223d43 09-Dec-2015 Alex Deymo <deymo@google.com> Build libprotobuf-cpp-lite for the host.

This patch builds libprotobuf-cpp-lite with and without rtti for the
host, using the same module names than when building for the target.
These libraries are automatically included by the build system when
generating C++ headers from a .proto file, so having the same name makes
that work for the host binaries as well.

Bug: 24619596
TEST=mma on linux and mac

Change-Id: I3af27bbbea3ab5ca1a418add3da1d03c4e1a63e5
ndroid.mk
df0d983d6fe606a53d70ff94d97c329317d735cf 08-Dec-2015 Brian Duff <bduff@google.com> Merge "Basic code insertion points for javanano protocompiler plugins." am: dea517e990
am: 9259a3011e

* commit '9259a3011e48fe78ce84416d45125a39725a65d8':
Basic code insertion points for javanano protocompiler plugins.
9259a3011e48fe78ce84416d45125a39725a65d8 08-Dec-2015 Brian Duff <bduff@google.com> Merge "Basic code insertion points for javanano protocompiler plugins."
am: dea517e990

* commit 'dea517e990189ca652c980dc89ab4ff645a96bdd':
Basic code insertion points for javanano protocompiler plugins.
dea517e990189ca652c980dc89ab4ff645a96bdd 08-Dec-2015 Brian Duff <bduff@google.com> Merge "Basic code insertion points for javanano protocompiler plugins."
4e97726326424715eda6a85d95122ba7abe25b35 08-Dec-2015 Joe Covalesky <jgc@google.com> Basic code insertion points for javanano protocompiler plugins.

Change-Id: I519e3882682638890150601270b74c38e5e8cb0e
rc/google/protobuf/compiler/javanano/javanano_file.cc
rc/google/protobuf/compiler/javanano/javanano_message.cc
7809d476ff492533a0536759db68c5f0c7483a2f 19-Nov-2015 Garret Kelly <gdk@google.com> Add libprotobuf-cpp-full-rtti target for the platform. am: 96c04e407f
am: 0b5d823b42

* commit '0b5d823b42ab07f55bd163910f9642bed75e17bd':
1f083e36d3e65f391ad09c92c773212eef2d7dc5 19-Nov-2015 Alex Deymo <deymo@google.com> Add libprotobuf-cpp-lite-rtti target for the platform. am: 8f8019ca63
am: 3584609610

* commit '358460961042c808943aae8b5b9ac377b5a694dd':
3ef9358143b055b550cdbb2cff8fa6e2fdfd1761 19-Nov-2015 Alex Deymo <deymo@google.com> Silence -Wsign-compare warning on protobuf-lite headers. am: a17c883010
am: 3a3cdd57ba

* commit '3a3cdd57ba8bdc0712a187f7c3c41a3014f5ca10':
33554badacfe1fde0857bd6c6a388a02fbf22368 19-Nov-2015 Daniel Erat <derat@google.com> Set LOCAL_EXPORT_C_INCLUDE_DIRS for shared and static libs. am: 6483431c73 -s ours
am: ba5daf6f22

* commit 'ba5daf6f227f5f439fa81d1d98b74ad6b1cfcafc':
0b5d823b42ab07f55bd163910f9642bed75e17bd 19-Nov-2015 Garret Kelly <gdk@google.com> Add libprotobuf-cpp-full-rtti target for the platform.
am: 96c04e407f

* commit '96c04e407fff5e49a4fb83d1c6c632e4db9d0827':
Add libprotobuf-cpp-full-rtti target for the platform.
358460961042c808943aae8b5b9ac377b5a694dd 19-Nov-2015 Alex Deymo <deymo@google.com> Add libprotobuf-cpp-lite-rtti target for the platform.
am: 8f8019ca63

* commit '8f8019ca631aae82500c0b66064d6b785df01f09':
Add libprotobuf-cpp-lite-rtti target for the platform.
3a3cdd57ba8bdc0712a187f7c3c41a3014f5ca10 19-Nov-2015 Alex Deymo <deymo@google.com> Silence -Wsign-compare warning on protobuf-lite headers.
am: a17c883010

* commit 'a17c883010fcd65ede6ce6f01c4ca022769ae8ba':
Silence -Wsign-compare warning on protobuf-lite headers.
ba5daf6f227f5f439fa81d1d98b74ad6b1cfcafc 19-Nov-2015 Daniel Erat <derat@google.com> Set LOCAL_EXPORT_C_INCLUDE_DIRS for shared and static libs.
am: 6483431c73 -s ours

* commit '6483431c73734412ed49d4ee280ec003f512f3ca':
Set LOCAL_EXPORT_C_INCLUDE_DIRS for shared and static libs.
98d1c0f6e1136f3a2b1bcfa1337faf45ef6d4359 19-Nov-2015 Damien Miller <djm@google.com> package version metadata for external/ am: b921c150c0
am: d242d01fc8

* commit 'd242d01fc8003ae53aaeee4763ac48582265095a':
d242d01fc8003ae53aaeee4763ac48582265095a 19-Nov-2015 Damien Miller <djm@google.com> package version metadata for external/
am: b921c150c0

* commit 'b921c150c086589251ce4472832918c90d8585e0':
package version metadata for external/
a2d1e5bb785af4eb15a2e28ae512b8b54ce2007e 17-Nov-2015 Garret Kelly <gdk@google.com> Add libprotobuf-cpp-full-rtti target for the platform.
am: 96c04e407f

* commit '96c04e407fff5e49a4fb83d1c6c632e4db9d0827':
Add libprotobuf-cpp-full-rtti target for the platform.
d7a9a7e8a5d282f753eb38497d7e615e7c18a586 17-Nov-2015 Alex Deymo <deymo@google.com> Add libprotobuf-cpp-lite-rtti target for the platform.
am: 8f8019ca63

* commit '8f8019ca631aae82500c0b66064d6b785df01f09':
Add libprotobuf-cpp-lite-rtti target for the platform.
e8d851be7c170614726202e38331cd67211b83b8 17-Nov-2015 Alex Deymo <deymo@google.com> Silence -Wsign-compare warning on protobuf-lite headers.
am: a17c883010

* commit 'a17c883010fcd65ede6ce6f01c4ca022769ae8ba':
Silence -Wsign-compare warning on protobuf-lite headers.
224336711394694c4e3428b35c22852eceba52e2 17-Nov-2015 Daniel Erat <derat@google.com> Set LOCAL_EXPORT_C_INCLUDE_DIRS for shared and static libs.
am: 6483431c73 -s ours

* commit '6483431c73734412ed49d4ee280ec003f512f3ca':
Set LOCAL_EXPORT_C_INCLUDE_DIRS for shared and static libs.
f35e503a4f5fc5fb2a2a250d0111e344575bae88 17-Nov-2015 Damien Miller <djm@google.com> package version metadata for external/
am: b921c150c0

* commit 'b921c150c086589251ce4472832918c90d8585e0':
package version metadata for external/
96c04e407fff5e49a4fb83d1c6c632e4db9d0827 05-Nov-2015 Garret Kelly <gdk@google.com> Add libprotobuf-cpp-full-rtti target for the platform.

Programs which don't use the lite runtime and do use -frtti require a
full protobuf target with the same flags.

Bug: none
Change-Id: If75ad33fa948933308768072602c0bb35e4eaac1
(cherry picked from commit 081728da938dbbc24ee029226e061c01b2304f18)
ndroid.mk
8f8019ca631aae82500c0b66064d6b785df01f09 09-Sep-2015 Alex Deymo <deymo@google.com> Add libprotobuf-cpp-lite-rtti target for the platform.

When linking against libprotobuf-lite, if your program is compiled with
-frtti, you need the typeinfo for google::protobuf::MessageLite. On the
other hand, if your program is compiled with -fno-rtti, you need
libprotobuf-lite to be compiled with -DGOOGLE_PROTOBUF_NO_RTTI so the
library headers don't attempt to use the type information.

To allow old programs compiled with -fno-rtti and new programs compiled
with -frtti coexists, this patch introduces a new target
libprotobuf-cpp-lite-rtti enabling -frtti on libprotobuf-cpp-lite
similar to the existing libprotobuf-cpp-full-gnustl-rtti.

Bug: 23084776
Change-Id: I28d435485b9cb2509dfecb0d0e70f0db150687d2
Test: `mma external/protobuf`

(cherry picked from commit a4e6f5be2813d8369dbaabe8eda497f5ed72a570)
ndroid.mk
a17c883010fcd65ede6ce6f01c4ca022769ae8ba 26-Aug-2015 Alex Deymo <deymo@google.com> Silence -Wsign-compare warning on protobuf-lite headers.

This is cherry-pick from upstream:
https://github.com/google/protobuf/commit/717f80749996ba97d050dd980a8e2ed97873d49e

Bug: 23084776
Change-Id: I2f52aa27eba9f7162338b3d453f47af5d80cf43a
(cherry picked from commit a0d463f6b8c341943da438944b591ee16348815f)
rc/google/protobuf/wire_format_lite_inl.h
6483431c73734412ed49d4ee280ec003f512f3ca 16-Jul-2015 Daniel Erat <derat@google.com> Set LOCAL_EXPORT_C_INCLUDE_DIRS for shared and static libs.

Export the src/ directory so other packages don't need to
manually add it as an include path.

Change-Id: I6ffccd66997b9da8e735e7e6ae49125ada830994
(cherry picked from commit 51cac91153363bcba2a90e4a8f219c49d5c3103f)
ndroid.mk
b921c150c086589251ce4472832918c90d8585e0 03-Jun-2015 Damien Miller <djm@google.com> package version metadata for external/

This will be used for automated notification of external vulnerability
reports.

Change-Id: I5f74fcb25dcee166c4328660900cad0a45411659
(cherry picked from commit 1e91ed3b0824b7211559dec2122e0a4d439679c0)
EADME.version
ccce8a7b74648545cb8284793608e034afbb9de4 05-Nov-2015 Garret Kelly <gdk@google.com> Merge "Add libprotobuf-cpp-full-rtti target for the platform."
081728da938dbbc24ee029226e061c01b2304f18 05-Nov-2015 Garret Kelly <gdk@google.com> Add libprotobuf-cpp-full-rtti target for the platform.

Programs which don't use the lite runtime and do use -frtti require a
full protobuf target with the same flags.

Bug: none
Change-Id: Ifc8f0d2a38d8e01dacbde2d28c72a328abb1a321
ndroid.mk
bcef2c7162a4d1831373a7f6910d5fd211ac55c0 23-Oct-2015 Brian Duff <bduff@google.com> Merge "Minor cleanup in CodedInputByteBufferNano." am: f0b8850a8e
am: 57a781dbec

* commit '57a781dbecdca5ee544c0d20b921288be46e0fb3':
Minor cleanup in CodedInputByteBufferNano.
57a781dbecdca5ee544c0d20b921288be46e0fb3 23-Oct-2015 Brian Duff <bduff@google.com> Merge "Minor cleanup in CodedInputByteBufferNano."
am: f0b8850a8e

* commit 'f0b8850a8e63b6811f9470dad5704c613724377f':
Minor cleanup in CodedInputByteBufferNano.
f0b8850a8e63b6811f9470dad5704c613724377f 23-Oct-2015 Brian Duff <bduff@google.com> Merge "Minor cleanup in CodedInputByteBufferNano."
9b8022f792896f4a6831abe8e30ee5b7977a3677 23-Oct-2015 Nathan Mittler <nathanmittler@google.com> Minor cleanup in CodedInputByteBufferNano.

There is some cruft in the CodedInputByteBufferNano related to
fast/slow path for reading bytes that is not applicable for nano, due to
the fact that all of the data is buffered into a final byte
array. Cleaning up the code a bit to make it more explicit that
truncation will result if the data is not buffered.

Change-Id: I94c44e970790df0b9b6b598b8dfe1d510dd40bc0
ava/src/main/java/com/google/protobuf/nano/CodedInputByteBufferNano.java
6395ec34ceed4aa22ac2f38016206506e262da36 09-Sep-2015 Dan Albert <danalbert@google.com> am 77e300be: am c0bdb541: am ecc40a3a: Merge "Fix name for NDK protobuf libraries."

* commit '77e300be5c54767980e166fc7febbfc9f270d43f':
Fix name for NDK protobuf libraries.
77e300be5c54767980e166fc7febbfc9f270d43f 09-Sep-2015 Dan Albert <danalbert@google.com> am c0bdb541: am ecc40a3a: Merge "Fix name for NDK protobuf libraries."

* commit 'c0bdb5415e78dfb6a07257fd7538960d6bef7cca':
Fix name for NDK protobuf libraries.
c0bdb5415e78dfb6a07257fd7538960d6bef7cca 09-Sep-2015 Dan Albert <danalbert@google.com> am ecc40a3a: Merge "Fix name for NDK protobuf libraries."

* commit 'ecc40a3a1dc0bb6b5a0cd0750f90bc7a7fefab43':
Fix name for NDK protobuf libraries.
ecc40a3a1dc0bb6b5a0cd0750f90bc7a7fefab43 09-Sep-2015 Dan Albert <danalbert@google.com> Merge "Fix name for NDK protobuf libraries."
c51f1e98cb155abfa9942e01158a70231fda26dc 09-Sep-2015 Alex Deymo <deymo@google.com> am 1511660d: am 50880c9b: am 1280a3a2: Merge "Add libprotobuf-cpp-lite-rtti target for the platform."

* commit '1511660df29e7a3deed5d30afa2a21e94a97001b':
Add libprotobuf-cpp-lite-rtti target for the platform.
1511660df29e7a3deed5d30afa2a21e94a97001b 09-Sep-2015 Alex Deymo <deymo@google.com> am 50880c9b: am 1280a3a2: Merge "Add libprotobuf-cpp-lite-rtti target for the platform."

* commit '50880c9b314659a5c29ff3598c77821857cfd673':
Add libprotobuf-cpp-lite-rtti target for the platform.
50880c9b314659a5c29ff3598c77821857cfd673 09-Sep-2015 Alex Deymo <deymo@google.com> am 1280a3a2: Merge "Add libprotobuf-cpp-lite-rtti target for the platform."

* commit '1280a3a26ba2e8960683b34daa3514000c5f6296':
Add libprotobuf-cpp-lite-rtti target for the platform.
1280a3a26ba2e8960683b34daa3514000c5f6296 09-Sep-2015 Alex Deymo <deymo@google.com> Merge "Add libprotobuf-cpp-lite-rtti target for the platform."
a4e6f5be2813d8369dbaabe8eda497f5ed72a570 09-Sep-2015 Alex Deymo <deymo@google.com> Add libprotobuf-cpp-lite-rtti target for the platform.

When linking against libprotobuf-lite, if your program is compiled with
-frtti, you need the typeinfo for google::protobuf::MessageLite. On the
other hand, if your program is compiled with -fno-rtti, you need
libprotobuf-lite to be compiled with -DGOOGLE_PROTOBUF_NO_RTTI so the
library headers don't attempt to use the type information.

To allow old programs compiled with -fno-rtti and new programs compiled
with -frtti coexists, this patch introduces a new target
libprotobuf-cpp-lite-rtti enabling -frtti on libprotobuf-cpp-lite
similar to the existing libprotobuf-cpp-full-gnustl-rtti.

Bug: 23084776
Change-Id: I85d5e794071e69500eaf54c42b1c70580177af70
Test: `mma external/protobuf`
ndroid.mk
9d8aa564a158adefbbaf07124b8bd26b12ee8c06 08-Sep-2015 Dan Albert <danalbert@google.com> am a1fb7a2f: am ca0deaf1: am ef76c066: Merge "Add *-ndk named NDK libraries."

* commit 'a1fb7a2f1be543d9ae18a62531e9b97296703ac6':
Add *-ndk named NDK libraries.
a1fb7a2f1be543d9ae18a62531e9b97296703ac6 08-Sep-2015 Dan Albert <danalbert@google.com> am ca0deaf1: am ef76c066: Merge "Add *-ndk named NDK libraries."

* commit 'ca0deaf1b14ddbc87befc7e79b6f4151e1285934':
Add *-ndk named NDK libraries.
ca0deaf1b14ddbc87befc7e79b6f4151e1285934 08-Sep-2015 Dan Albert <danalbert@google.com> am ef76c066: Merge "Add *-ndk named NDK libraries."

* commit 'ef76c0660019521f1a0d7d6411266633f2409122':
Add *-ndk named NDK libraries.
ef76c0660019521f1a0d7d6411266633f2409122 08-Sep-2015 Dan Albert <danalbert@google.com> Merge "Add *-ndk named NDK libraries."
1f0e5f00238121a970f563cec83830a49037aa7e 08-Sep-2015 Dan Albert <danalbert@google.com> Fix name for NDK protobuf libraries.

Name them *-ndk so it's clear which library is which.

Change-Id: I85614f20efeb8d7ce0b2d32c2c16f90f17a5e30d
ndroid.mk
3203dd4f3bdd58674f7293b3b1ed742c05209b5b 08-Sep-2015 Dan Albert <danalbert@google.com> Add *-ndk named NDK libraries.

These are identical to the current NDK libraries except for the name.
This was we can submit this patch, fix up all the users of the
libraries, and then remove the old names rather than causes build
breaks in downstream branches.

Change-Id: Ifa4902f484da5831b6a8915572f5943c4903da3d
ndroid.mk
6d75fecfc75e3f16b37f0d81b1bb7f4f7b2c677a 03-Sep-2015 Dan Willemsen <dwillemsen@google.com> am d8955bac: am 21c47d48: am 5b142166: Merge "Stop checking HOST_OS, whitelist windows module"

* commit 'd8955bac38c2ceb7d1cc97b4856651722630f3dd':
Stop checking HOST_OS, whitelist windows module
d8955bac38c2ceb7d1cc97b4856651722630f3dd 03-Sep-2015 Dan Willemsen <dwillemsen@google.com> am 21c47d48: am 5b142166: Merge "Stop checking HOST_OS, whitelist windows module"

* commit '21c47d486ea9bea5a16949d8db8e680c7ec730c7':
Stop checking HOST_OS, whitelist windows module
21c47d486ea9bea5a16949d8db8e680c7ec730c7 03-Sep-2015 Dan Willemsen <dwillemsen@google.com> am 5b142166: Merge "Stop checking HOST_OS, whitelist windows module"

* commit '5b14216647db393b0ae532c35a307b0cc8fed597':
Stop checking HOST_OS, whitelist windows module
5b14216647db393b0ae532c35a307b0cc8fed597 03-Sep-2015 Dan Willemsen <dwillemsen@google.com> Merge "Stop checking HOST_OS, whitelist windows module"
adde3496cdb03cac85ea9c724a694bbe3d62c114 19-Aug-2015 Dan Willemsen <dwillemsen@google.com> Stop checking HOST_OS, whitelist windows module

The LOCAL_CXX_STL libc++_static -> libstdc++ for windows is now
happening in build/

Bug: 23566667
Change-Id: Ia6c69f0395dab0135f84cb89f1c0c69c030c8504
ndroid.mk
4e3a3f10aa64359c294a6a01b4da4620d3f1c73e 01-Sep-2015 Brian Duff <bduff@google.com> am 3ce63234: am 92966197: am 978f5dcd: Merge "Call super.storeUnknownField in Nano protobufs."

* commit '3ce632348a2fe286d3c22a049cbda9a0068d2733':
Call super.storeUnknownField in Nano protobufs.
3ce632348a2fe286d3c22a049cbda9a0068d2733 01-Sep-2015 Brian Duff <bduff@google.com> am 92966197: am 978f5dcd: Merge "Call super.storeUnknownField in Nano protobufs."

* commit '92966197f8c638f117025c6b34281c649fdb513e':
Call super.storeUnknownField in Nano protobufs.
92966197f8c638f117025c6b34281c649fdb513e 01-Sep-2015 Brian Duff <bduff@google.com> am 978f5dcd: Merge "Call super.storeUnknownField in Nano protobufs."

* commit '978f5dcdba6b6d1bb54011561faed6d3a7bd21a6':
Call super.storeUnknownField in Nano protobufs.
978f5dcdba6b6d1bb54011561faed6d3a7bd21a6 01-Sep-2015 Brian Duff <bduff@google.com> Merge "Call super.storeUnknownField in Nano protobufs."
c1db4a24ebb7c5e8a2e3f53fd5f26b6fed13ce47 01-Sep-2015 Giorgi Kvirkvia <kvirkvia@google.com> Call super.storeUnknownField in Nano protobufs.

Effect is reduced dexcount.

Change-Id: I6aad0c71f9b702b195c6a5964a20e1918d731701
rc/google/protobuf/compiler/javanano/javanano_message.cc
6151b3e90fb7dc17c9018f3f255c9e01956cc627 28-Aug-2015 Dan Albert <danalbert@google.com> am 58cc1169: am bd28b466: am 9641e6e9: Merge "Don\'t use libc++ for Windows. It doesn\'t exist."

* commit '58cc116923bb9810b7692ee55df7c432cb4a47a0':
Don't use libc++ for Windows. It doesn't exist.
58cc116923bb9810b7692ee55df7c432cb4a47a0 28-Aug-2015 Dan Albert <danalbert@google.com> am bd28b466: am 9641e6e9: Merge "Don\'t use libc++ for Windows. It doesn\'t exist."

* commit 'bd28b4662e854ae19a132ee9ed8984f2c71db18c':
Don't use libc++ for Windows. It doesn't exist.
bd28b4662e854ae19a132ee9ed8984f2c71db18c 28-Aug-2015 Dan Albert <danalbert@google.com> am 9641e6e9: Merge "Don\'t use libc++ for Windows. It doesn\'t exist."

* commit '9641e6e9a53b97fba7a9956041aa3f1d0058d1a8':
Don't use libc++ for Windows. It doesn't exist.
9641e6e9a53b97fba7a9956041aa3f1d0058d1a8 28-Aug-2015 Dan Albert <danalbert@google.com> Merge "Don't use libc++ for Windows. It doesn't exist."
44abb25a43c61f68eea57771ceb02c09c05b0b01 28-Aug-2015 Dan Albert <danalbert@google.com> Don't use libc++ for Windows. It doesn't exist.

Change-Id: I583496acb953473bd179ba41e7c04e615d10e18d
ndroid.mk
1e273f0c71be3daf12b19fc7dfc9cbcf8ab98447 28-Aug-2015 Dan Albert <danalbert@google.com> am edec88b3: am 07769c42: am 8e216366: Merge "Stop using libstdc++."

* commit 'edec88b33c753ac718007cab0e6784cbbfbb13c9':
Stop using libstdc++.
edec88b33c753ac718007cab0e6784cbbfbb13c9 28-Aug-2015 Dan Albert <danalbert@google.com> am 07769c42: am 8e216366: Merge "Stop using libstdc++."

* commit '07769c425288e5322265bded7735222cd9501ff5':
Stop using libstdc++.
07769c425288e5322265bded7735222cd9501ff5 28-Aug-2015 Dan Albert <danalbert@google.com> am 8e216366: Merge "Stop using libstdc++."

* commit '8e2163664f31b90d64b095af7c0c5d5b51188489':
Stop using libstdc++.
8e2163664f31b90d64b095af7c0c5d5b51188489 28-Aug-2015 Dan Albert <danalbert@google.com> Merge "Stop using libstdc++."
286de9332e7d7e4a42c52fb4e36913997b88504b 28-Aug-2015 Dan Albert <danalbert@google.com> Stop using libstdc++.

Statically link libc++ because we copy aprotoc to unbundled projects
where libc++.so may not be available.

Change-Id: I1f1abc015696c1ccd8600338c147d51aca2253a1
ndroid.mk
c08d96fe3c3026d26821d3afbc2bd74d51b7911b 28-Aug-2015 Alex Deymo <deymo@google.com> am f383b856: am 892ced67: am 787fc4d5: Merge "Silence -Wsign-compare warning on protobuf-lite headers."

* commit 'f383b856f03cc0010a0bd1a9d4e075706eca49bd':
Silence -Wsign-compare warning on protobuf-lite headers.
f383b856f03cc0010a0bd1a9d4e075706eca49bd 27-Aug-2015 Alex Deymo <deymo@google.com> am 892ced67: am 787fc4d5: Merge "Silence -Wsign-compare warning on protobuf-lite headers."

* commit '892ced67f1da6e76aa1032f2e59ddb093a674a68':
Silence -Wsign-compare warning on protobuf-lite headers.
f9bda73150b7b51cd20643b2522f1467a9124215 27-Aug-2015 Daniel Erat <derat@google.com> am 848e66cd: am cfad3ce5: (-s ours) am 2bd25081: Merge "Set LOCAL_EXPORT_C_INCLUDE_DIRS for shared and static libs."

* commit '848e66cd4aeb194196b7fc5434ac9faea95000e8':
892ced67f1da6e76aa1032f2e59ddb093a674a68 27-Aug-2015 Alex Deymo <deymo@google.com> am 787fc4d5: Merge "Silence -Wsign-compare warning on protobuf-lite headers."

* commit '787fc4d52fdbbd3c89bb90369a6bef4bb6b611e8':
Silence -Wsign-compare warning on protobuf-lite headers.
848e66cd4aeb194196b7fc5434ac9faea95000e8 27-Aug-2015 Daniel Erat <derat@google.com> am cfad3ce5: (-s ours) am 2bd25081: Merge "Set LOCAL_EXPORT_C_INCLUDE_DIRS for shared and static libs."

* commit 'cfad3ce531ceb865e637494eef771257c31ad336':
787fc4d52fdbbd3c89bb90369a6bef4bb6b611e8 27-Aug-2015 Alex Deymo <deymo@google.com> Merge "Silence -Wsign-compare warning on protobuf-lite headers."
87756faca2409655d414b253179bc24524ead945 27-Aug-2015 John Reck <jreck@google.com> Fix -Wsign-compare -Werror build

Cherry-pick of:
https://github.com/google/protobuf/commit/717f80749996ba97d050dd980a8e2ed97873d49e

Bug: 23566406
Change-Id: Ieb40fa079c896687bdd636640a35a7e6b78c1a32
rc/google/protobuf/wire_format_lite_inl.h
a0d463f6b8c341943da438944b591ee16348815f 26-Aug-2015 Alex Deymo <deymo@google.com> Silence -Wsign-compare warning on protobuf-lite headers.

This is cherry-pick from upstream:
https://github.com/google/protobuf/commit/717f80749996ba97d050dd980a8e2ed97873d49e

Bug: 23084776
Change-Id: I7304f465fa92b9715e2c29f799103d1650748cf7
rc/google/protobuf/wire_format_lite_inl.h
0c6209af0c058c1e610a1035020e622456c40059 31-Jul-2015 Ian Pedowitz <ijpedowitz@google.com> Merge "Revert "Update the nano Protocol Buffer compiler to generate code in a ".nano" suffixed package.""
ab7fb7fd396ab2a90a9fde19b9786359bf03443b 31-Jul-2015 Daniel Weis <dweis@google.com> Revert "Update the nano Protocol Buffer compiler to generate code in a ".nano" suffixed package."

This reverts commit 6be128fb6b66872025dae6c6acf16339509cdece.

Change-Id: I2bfb4ffb4082f330c42ec9c64c70aa3e2870dfe7
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
1a9437fb9bfb1053e2152b4d530367d7c93e82f0 30-Jul-2015 Daniel Weis <dweis@google.com> Merge "Update the nano Protocol Buffer compiler to generate code in a ".nano" suffixed package."
6be128fb6b66872025dae6c6acf16339509cdece 20-Jul-2015 Daniel Weis <dweis@google.com> Update the nano Protocol Buffer compiler to generate code in a ".nano" suffixed package.

This change follows up on the foundation laid by
https://android-review.googlesource.com/#/c/154532/; it leverages this descriptor option to
conditionally generate code in a ".nano" suffixed package. The conditional behavior is present to
enable teams to migrate incrementally to the new behavior and to serve as an intermediary step
towards the elimination of any non-nano suffixed packages.

If this change breaks your build, please review the announcement email sent out to android-eng@:
https://groups.google.com/a/google.com/forum/#!msg/android-eng/Ga49081_y3k/YWxD42JtXzAJ

Change-Id: Ia34468bc41e2f884d61356791b00f245852aaf68
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
5f716a7952cd3acde04719a908fbeb3fbe2e46b6 30-Jul-2015 Bill Napier <napier@google.com> Merge "package version metadata for external/"
7c759a95ef58b0b07dbf2f3d537bbbc501f6ae20 16-Jul-2015 Daniel Erat <derat@google.com> am c4d4c818: am 2bd25081: Merge "Set LOCAL_EXPORT_C_INCLUDE_DIRS for shared and static libs."

* commit 'c4d4c81899d6a6e289be04bd5fb374df6c4036fa':
Set LOCAL_EXPORT_C_INCLUDE_DIRS for shared and static libs.
c4d4c81899d6a6e289be04bd5fb374df6c4036fa 16-Jul-2015 Daniel Erat <derat@google.com> am 2bd25081: Merge "Set LOCAL_EXPORT_C_INCLUDE_DIRS for shared and static libs."

* commit '2bd25081c18d440dd70f1ff0ed726f89295e3fdb':
Set LOCAL_EXPORT_C_INCLUDE_DIRS for shared and static libs.
cfad3ce531ceb865e637494eef771257c31ad336 16-Jul-2015 Daniel Erat <derat@google.com> am 2bd25081: Merge "Set LOCAL_EXPORT_C_INCLUDE_DIRS for shared and static libs."

* commit '2bd25081c18d440dd70f1ff0ed726f89295e3fdb':
Set LOCAL_EXPORT_C_INCLUDE_DIRS for shared and static libs.
2bd25081c18d440dd70f1ff0ed726f89295e3fdb 16-Jul-2015 Daniel Erat <derat@google.com> Merge "Set LOCAL_EXPORT_C_INCLUDE_DIRS for shared and static libs."
51cac91153363bcba2a90e4a8f219c49d5c3103f 16-Jul-2015 Daniel Erat <derat@google.com> Set LOCAL_EXPORT_C_INCLUDE_DIRS for shared and static libs.

Export the src/ directory so other packages don't need to
manually add it as an include path.

Change-Id: I4d4e8328bb0686d64143983e4de440cfa26f4e33
ndroid.mk
3a3bfea6f0c62ff822534d0f09119e506c951b14 07-Jul-2015 Brian Duff <bduff@google.com> am ca19bf31: am 6180b684: am d7f9473d: am 1817ed30: Merge "Update CodedOutputByteBufferNano to properly handle a malformed surrogate pair with a buffer too small to output a potentially well formed surrogate pair. This behavior mimics that of the ByteBuffer based meth

* commit 'ca19bf312c1b962ab6c2c5663bb2d628411d62a1':
e5d8d653a1ca54a7ea6e0c723b202a9282d73656 07-Jul-2015 Brian Duff <bduff@google.com> am ea384c4f: am 9eb445da: am d85b156e: am 89fa3126: Merge "Update thei Protocol Buffer descriptor.proto with the new javanano_use_deprecated_package FileOption. Regenerated the descriptor.pb.{c,h} based on the new proto file."

* commit 'ea384c4f495df7374fbb45f76ea31073d0dcd273':
17305a47d680cfd7934499c3789fd88ee1ef0df2 07-Jul-2015 Bill Yi <byi@google.com> am 6c01943c: am b077faea: am 738a73ad: am 999188d0: Add MODULE_LICENSE and NOTICE

* commit '6c01943c6dc59914a776e1213bc7585a61ca8e6a':
e590d894281bfae72f74cca5e6c30395b0e6bd9d 07-Jul-2015 Austin Schuh <austin@peloton-tech.com> am 49efdaf9: am 7875d5d2: am a491cabf: am 2f4d8a1b: Fixed Unused Parameter warning in headers.

* commit '49efdaf9e905d07dd683aabb3a5086e156067574':
0147309f0c841f58fdeee9b181789049d1db4f4b 07-Jul-2015 Jeff Davidson <jpd@google.com> am db5588d9: am 8b51c009: am 9ef21495: am 343ef18b: Merge "Fixed Unused Parameter warning in headers."

* commit 'db5588d99811837353af419f173401bc4d2f1a9a':
70c00a78df90ca810d5088a421124aefa1eb3546 07-Jul-2015 Jeff Davidson <jpd@google.com> am 48b85392: am b51b1946: am 9b4557e1: resolved conflicts for merge of dc5bca2a to mnc-dev-plus-aosp

* commit '48b85392df8f8526ede3be471c8b397c8f851cb8':
78ab8f0ff48e7e9cdc8537bd298a1a19cc2d6762 07-Jul-2015 Jeff Davidson <jpd@google.com> am 95b227e7: am 0fc6d62e: am 72ae3583: am 210d15c8: Merge "Speed up little endian int/long writes."

* commit '95b227e7adf31524df89faa1f0ea91e0149dae33':
cfd4de517e92049b36835de5220985c45f3c51d7 07-Jul-2015 Andre Eisenbach <eisenbach@google.com> am 56ff53c9: am 17282c28: am ff12ec27: am 6a6ad15b: Merge "Handle 0-length byte buffers in micro and nano protobufs"

* commit '56ff53c93bcdd85cfa6f53ede769dbd35de674c5':
88873fb46a9b13b35ec057e7a26b7b44ec33b953 07-Jul-2015 Andre Eisenbach <eisenbach@google.com> am 1b691819: am 2c5770ad: am 4d8b123b: Handle 0-length byte buffers in micro and nano protobufs

* commit '1b6918198d6b5e62fdb76ace2f982a1a2d19b57a':
864a0ed9627cce2851d8530faad9625ab764b8c2 07-Jul-2015 Juan Silveira <jjso@google.com> am cffa850a: (-s ours) am 5d74b1fe: am 90ca7bfb: (-s ours) am 4a967333: (-s ours) am 2a22b4d8: DO NOT MERGE

* commit 'cffa850a9d8fb46a48de6180c9584387d480527c':
ca19bf312c1b962ab6c2c5663bb2d628411d62a1 07-Jul-2015 Brian Duff <bduff@google.com> am 6180b684: am d7f9473d: am 1817ed30: Merge "Update CodedOutputByteBufferNano to properly handle a malformed surrogate pair with a buffer too small to output a potentially well formed surrogate pair. This behavior mimics that of the ByteBuffer based methods."

* commit '6180b684fac1cdd3d8fbb69d755be6ca540d0826':
ea384c4f495df7374fbb45f76ea31073d0dcd273 07-Jul-2015 Brian Duff <bduff@google.com> am 9eb445da: am d85b156e: am 89fa3126: Merge "Update thei Protocol Buffer descriptor.proto with the new javanano_use_deprecated_package FileOption. Regenerated the descriptor.pb.{c,h} based on the new proto file."

* commit '9eb445da75798c275f5ea7ac0a250c92aa67aaca':
6c01943c6dc59914a776e1213bc7585a61ca8e6a 07-Jul-2015 Bill Yi <byi@google.com> am b077faea: am 738a73ad: am 999188d0: Add MODULE_LICENSE and NOTICE

* commit 'b077faea702167465bec5204404e46cefaaf77dd':
49efdaf9e905d07dd683aabb3a5086e156067574 07-Jul-2015 Austin Schuh <austin@peloton-tech.com> am 7875d5d2: am a491cabf: am 2f4d8a1b: Fixed Unused Parameter warning in headers.

* commit '7875d5d2e7a55f3527971f7595c46aceed2000e9':
db5588d99811837353af419f173401bc4d2f1a9a 07-Jul-2015 Jeff Davidson <jpd@google.com> am 8b51c009: am 9ef21495: am 343ef18b: Merge "Fixed Unused Parameter warning in headers."

* commit '8b51c0096b54a2477421e17fab28c8302d2d2652':
48b85392df8f8526ede3be471c8b397c8f851cb8 07-Jul-2015 Jeff Davidson <jpd@google.com> am b51b1946: am 9b4557e1: resolved conflicts for merge of dc5bca2a to mnc-dev-plus-aosp

* commit 'b51b19469c9308b98aa392dfdf05804e51e3e7a7':
95b227e7adf31524df89faa1f0ea91e0149dae33 07-Jul-2015 Jeff Davidson <jpd@google.com> am 0fc6d62e: am 72ae3583: am 210d15c8: Merge "Speed up little endian int/long writes."

* commit '0fc6d62e0047d9c9bdfbfa8d017e77c3058d0da6':
56ff53c93bcdd85cfa6f53ede769dbd35de674c5 07-Jul-2015 Andre Eisenbach <eisenbach@google.com> am 17282c28: am ff12ec27: am 6a6ad15b: Merge "Handle 0-length byte buffers in micro and nano protobufs"

* commit '17282c280d5e50a06136b068f6288493bbb4d9f8':
1b6918198d6b5e62fdb76ace2f982a1a2d19b57a 07-Jul-2015 Andre Eisenbach <eisenbach@google.com> am 2c5770ad: am 4d8b123b: Handle 0-length byte buffers in micro and nano protobufs

* commit '2c5770ad8868bdc6ab66a8efb334ef6c24111f59':
cffa850a9d8fb46a48de6180c9584387d480527c 07-Jul-2015 Juan Silveira <jjso@google.com> am 5d74b1fe: am 90ca7bfb: (-s ours) am 4a967333: (-s ours) am 2a22b4d8: DO NOT MERGE

* commit '5d74b1fea8b108c51c76c0c16696c1e19faf0fb8':
6180b684fac1cdd3d8fbb69d755be6ca540d0826 18-Jun-2015 Brian Duff <bduff@google.com> am d7f9473d: am 1817ed30: Merge "Update CodedOutputByteBufferNano to properly handle a malformed surrogate pair with a buffer too small to output a potentially well formed surrogate pair. This behavior mimics that of the ByteBuffer based methods."

* commit 'd7f9473d9e2684e9dfe54db5b32eea6b43bbcc82':
Update CodedOutputByteBufferNano to properly handle a malformed surrogate pair with a buffer too small to output a potentially well formed surrogate pair. This behavior mimics that of the ByteBuffer based methods.
d7f9473d9e2684e9dfe54db5b32eea6b43bbcc82 18-Jun-2015 Brian Duff <bduff@google.com> am 1817ed30: Merge "Update CodedOutputByteBufferNano to properly handle a malformed surrogate pair with a buffer too small to output a potentially well formed surrogate pair. This behavior mimics that of the ByteBuffer based methods."

* commit '1817ed30d663c9205feb3f0ae80e4c4f6eaa4c3d':
Update CodedOutputByteBufferNano to properly handle a malformed surrogate pair with a buffer too small to output a potentially well formed surrogate pair. This behavior mimics that of the ByteBuffer based methods.
1817ed30d663c9205feb3f0ae80e4c4f6eaa4c3d 18-Jun-2015 Brian Duff <bduff@google.com> Merge "Update CodedOutputByteBufferNano to properly handle a malformed surrogate pair with a buffer too small to output a potentially well formed surrogate pair. This behavior mimics that of the ByteBuffer based methods."
d2195e15b89fe9face5eb71340acd288148f25e8 18-Jun-2015 Daniel Weis <dweis@google.com> Update CodedOutputByteBufferNano to properly handle a malformed surrogate pair with a buffer too small to output a potentially well formed surrogate pair. This behavior mimics that of the ByteBuffer based methods.

Change-Id: Ic8aa9c6c11c2f4eb3e9bb20f83a22e5ab72a3e76
ava/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java
9eb445da75798c275f5ea7ac0a250c92aa67aaca 12-Jun-2015 Brian Duff <bduff@google.com> am d85b156e: am 89fa3126: Merge "Update thei Protocol Buffer descriptor.proto with the new javanano_use_deprecated_package FileOption. Regenerated the descriptor.pb.{c,h} based on the new proto file."

* commit 'd85b156e0a8142bc45ce83a0bbb210a28443734d':
Update thei Protocol Buffer descriptor.proto with the new javanano_use_deprecated_package FileOption. Regenerated the descriptor.pb.{c,h} based on the new proto file.
d85b156e0a8142bc45ce83a0bbb210a28443734d 12-Jun-2015 Brian Duff <bduff@google.com> am 89fa3126: Merge "Update thei Protocol Buffer descriptor.proto with the new javanano_use_deprecated_package FileOption. Regenerated the descriptor.pb.{c,h} based on the new proto file."

* commit '89fa3126cb321cdb261178baf6267a369f69bfee':
Update thei Protocol Buffer descriptor.proto with the new javanano_use_deprecated_package FileOption. Regenerated the descriptor.pb.{c,h} based on the new proto file.
89fa3126cb321cdb261178baf6267a369f69bfee 12-Jun-2015 Brian Duff <bduff@google.com> Merge "Update thei Protocol Buffer descriptor.proto with the new javanano_use_deprecated_package FileOption. Regenerated the descriptor.pb.{c,h} based on the new proto file."
6d7e42a54a07955029d7363961a927c04d576298 12-Jun-2015 Daniel Weis <dweis@google.com> Update thei Protocol Buffer descriptor.proto with the new javanano_use_deprecated_package FileOption.
Regenerated the descriptor.pb.{c,h} based on the new proto file.

As part of an effort to eliminate one version violations, the nano Protocol Buffer compiler will soon output code in packages suffixed with ".nano" for protocol buffers that do not set this option.

Change-Id: If3184845a0458d16f625036e81507ef9cfdd9217
rc/google/protobuf/descriptor.pb.cc
rc/google/protobuf/descriptor.pb.h
rc/google/protobuf/descriptor.proto
1e91ed3b0824b7211559dec2122e0a4d439679c0 03-Jun-2015 Damien Miller <djm@google.com> package version metadata for external/

This will be used for automated notification of external vulnerability
reports.

Change-Id: I614c555d2e68350d8b13980ed66617bf5bdfa055
EADME.version
b077faea702167465bec5204404e46cefaaf77dd 22-May-2015 Bill Yi <byi@google.com> am 738a73ad: am 999188d0: Add MODULE_LICENSE and NOTICE

* commit '738a73ad5d7fe494c42ed1cb4a489ef3ecfe177f':
Add MODULE_LICENSE and NOTICE
738a73ad5d7fe494c42ed1cb4a489ef3ecfe177f 22-May-2015 Bill Yi <byi@google.com> am 999188d0: Add MODULE_LICENSE and NOTICE

* commit '999188d0dc72e97f7fe08bb756958a2cf090f4e7':
Add MODULE_LICENSE and NOTICE
999188d0dc72e97f7fe08bb756958a2cf090f4e7 22-May-2015 Bill Yi <byi@google.com> Add MODULE_LICENSE and NOTICE

Change-Id: I833f73aa0f5331a2998fae8a2a091dbe0fc744a6
ODULE_LICENSE_APACHE2
OTICE
7875d5d2e7a55f3527971f7595c46aceed2000e9 20-May-2015 Austin Schuh <austin@peloton-tech.com> am a491cabf: am 2f4d8a1b: Fixed Unused Parameter warning in headers.

* commit 'a491cabf70527580f3e9e1416b0f268015d22ad4':
Fixed Unused Parameter warning in headers.
a491cabf70527580f3e9e1416b0f268015d22ad4 20-May-2015 Austin Schuh <austin@peloton-tech.com> am 2f4d8a1b: Fixed Unused Parameter warning in headers.

* commit '2f4d8a1b744e2e62dcd68b7cb7159000e5751975':
Fixed Unused Parameter warning in headers.
8b51c0096b54a2477421e17fab28c8302d2d2652 20-May-2015 Jeff Davidson <jpd@google.com> am 9ef21495: am 343ef18b: Merge "Fixed Unused Parameter warning in headers."

* commit '9ef21495334503b1d9ebd4b5cb143b2b1172cf51':
Fixed Unused Parameter warning in headers.
9ef21495334503b1d9ebd4b5cb143b2b1172cf51 20-May-2015 Jeff Davidson <jpd@google.com> am 343ef18b: Merge "Fixed Unused Parameter warning in headers."

* commit '343ef18b1f8f9f6aff11de57c4e292a261da795b':
Fixed Unused Parameter warning in headers.
343ef18b1f8f9f6aff11de57c4e292a261da795b 20-May-2015 Jeff Davidson <jpd@google.com> Merge "Fixed Unused Parameter warning in headers."
2f4d8a1b744e2e62dcd68b7cb7159000e5751975 01-Nov-2014 Austin Schuh <austin@peloton-tech.com> Fixed Unused Parameter warning in headers.

Cherry-pick of:
https://github.com/google/protobuf/commit/918e3ee8b46a0f79f97ed0197de08bd61fa5f053

Bug: 21303860
Signed-off-by: Jeff Davidson <jpd@google.com>
Change-Id: I2690e676cde4c512412f3ccc15d9f50e59c88213
rc/google/protobuf/descriptor.h
rc/google/protobuf/message.h
rc/google/protobuf/repeated_field.h
4a0078628003c824f839fa22ae0ce9f133c8aa98 01-Nov-2014 Austin Schuh <austin@peloton-tech.com> Fixed Unused Parameter warning in headers.

Cherry-pick of:
https://github.com/google/protobuf/commit/918e3ee8b46a0f79f97ed0197de08bd61fa5f053

Bug: 21303860
Signed-off-by: Jeff Davidson <jpd@google.com>
Change-Id: I2690e676cde4c512412f3ccc15d9f50e59c88213
rc/google/protobuf/descriptor.h
rc/google/protobuf/message.h
rc/google/protobuf/repeated_field.h
b51b19469c9308b98aa392dfdf05804e51e3e7a7 13-May-2015 Jeff Davidson <jpd@google.com> am 9b4557e1: resolved conflicts for merge of dc5bca2a to mnc-dev-plus-aosp

* commit '9b4557e1bffb247a7b1e7785dbbc0af8e9980082':
Add a flag to use offset/length with byte arrays.
9b4557e1bffb247a7b1e7785dbbc0af8e9980082 13-May-2015 Jeff Davidson <jpd@google.com> resolved conflicts for merge of dc5bca2a to mnc-dev-plus-aosp
dc5bca2a39a33e90efc447a298e8244848c3ebf1 13-May-2015 Jeff Davidson <jpd@google.com> Merge "Add a flag to use offset/length with byte arrays."
4f87f0d25b75e045f55cc09c8a9085c1cd7cb238 08-May-2015 Jeff Davidson <jpd@google.com> Add a flag to use offset/length with byte arrays.

This is an advanced option that most users won't want/need. However,
it can greatly optimize flows where we want to reuse byte[] buffers
from other locations without having to first copy the contents into
a new array of the exact correct size.

Bug: 20636336
Change-Id: Ia8d0af82e952858f9571f84110da621da776619c
ava/pom.xml
ava/src/main/java/com/google/protobuf/nano/CodedInputByteBufferNano.java
ava/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_params.h
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.h
rc/google/protobuf/unittest_bytes_offset_length_nano.proto
0fc6d62e0047d9c9bdfbfa8d017e77c3058d0da6 12-May-2015 Jeff Davidson <jpd@google.com> am 72ae3583: am 210d15c8: Merge "Speed up little endian int/long writes."

* commit '72ae35837d622d3422a0efe11a223621038c2f34':
Speed up little endian int/long writes.
72ae35837d622d3422a0efe11a223621038c2f34 12-May-2015 Jeff Davidson <jpd@google.com> am 210d15c8: Merge "Speed up little endian int/long writes."

* commit '210d15c8e6092c0442f19b08e7c564bffdd7ae12':
Speed up little endian int/long writes.
210d15c8e6092c0442f19b08e7c564bffdd7ae12 12-May-2015 Jeff Davidson <jpd@google.com> Merge "Speed up little endian int/long writes."
b6872c8af4117d0e78967e8cced7214a8ac34e2d 08-May-2015 Jeff Davidson <jpd@google.com> Speed up little endian int/long writes.

Bug: 20636336
Change-Id: I303d712967f9885f7c3082d00f961f8ab93a6aed
ava/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java
17282c280d5e50a06136b068f6288493bbb4d9f8 07-May-2015 Andre Eisenbach <eisenbach@google.com> am ff12ec27: am 6a6ad15b: Merge "Handle 0-length byte buffers in micro and nano protobufs"

* commit 'ff12ec277cd5919ffd7115cc9048940d56fd0d5a':
Handle 0-length byte buffers in micro and nano protobufs
ff12ec277cd5919ffd7115cc9048940d56fd0d5a 07-May-2015 Andre Eisenbach <eisenbach@google.com> am 6a6ad15b: Merge "Handle 0-length byte buffers in micro and nano protobufs"

* commit '6a6ad15bc94ef60e647fc8752419976d4d33f848':
Handle 0-length byte buffers in micro and nano protobufs
2c5770ad8868bdc6ab66a8efb334ef6c24111f59 05-May-2015 Andre Eisenbach <eisenbach@google.com> am 4d8b123b: Handle 0-length byte buffers in micro and nano protobufs

* commit '4d8b123b8985b3f87a640be2d9a1b4b730b5fdca':
Handle 0-length byte buffers in micro and nano protobufs
4d8b123b8985b3f87a640be2d9a1b4b730b5fdca 04-May-2015 Andre Eisenbach <eisenbach@google.com> Handle 0-length byte buffers in micro and nano protobufs

Change-Id: I845ee1ab1005d25c8d77a8c2ed801c0f7b7c847b
ava/src/main/java/com/google/protobuf/micro/CodedInputStreamMicro.java
ava/src/main/java/com/google/protobuf/nano/CodedInputByteBufferNano.java
6a6ad15bc94ef60e647fc8752419976d4d33f848 05-May-2015 Andre Eisenbach <eisenbach@google.com> Merge "Handle 0-length byte buffers in micro and nano protobufs"
584381094c72fdeab18a7bb158c27da82b70aecd 04-May-2015 Andre Eisenbach <eisenbach@google.com> Handle 0-length byte buffers in micro and nano protobufs

Change-Id: I845ee1ab1005d25c8d77a8c2ed801c0f7b7c847b
ava/src/main/java/com/google/protobuf/micro/CodedInputStreamMicro.java
ava/src/main/java/com/google/protobuf/nano/CodedInputByteBufferNano.java
5d74b1fea8b108c51c76c0c16696c1e19faf0fb8 29-Apr-2015 Juan Silveira <jjso@google.com> am 90ca7bfb: (-s ours) am 4a967333: (-s ours) am 2a22b4d8: DO NOT MERGE

* commit '90ca7bfb7fc5c91f1593ad0efb8e294cf956b5c4':
DO NOT MERGE
90ca7bfb7fc5c91f1593ad0efb8e294cf956b5c4 29-Apr-2015 Juan Silveira <jjso@google.com> am 4a967333: (-s ours) am 2a22b4d8: DO NOT MERGE

* commit '4a9673333abfffe0b3603d412e1f3bc134b443ac':
DO NOT MERGE
4a9673333abfffe0b3603d412e1f3bc134b443ac 29-Apr-2015 Juan Silveira <jjso@google.com> am 2a22b4d8: DO NOT MERGE

* commit '2a22b4d85d0026e8ffc8768b4822bc36120fc6d4':
DO NOT MERGE
2a22b4d85d0026e8ffc8768b4822bc36120fc6d4 17-Jul-2014 Juan Silveira <jjso@google.com> DO NOT MERGE

Add a hasExtension method to ExtendableMessageNano.

It allows checking for the presence of an extension without having to
deserialize the field.

This a cherry-pick of 0f67b212cd169ccf83221273ed88504d7e3f8165 from master.

Change-Id: Id542d20274b2435b7bc2b322740e9984cb8639a1
ava/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
c68dba6080b13aba4f72bcf616f29af8e0bf617e 22-Apr-2015 Brian Duff <bduff@google.com> am a07081b8: am 63b42c8d: am 92f1bf25: Merge "Throw OutOfSpaceException instead of IllegalArgumentException."

* commit 'a07081b82c9a7b3da4a4a0cb577748c66bf2bf9e':
Throw OutOfSpaceException instead of IllegalArgumentException.
a07081b82c9a7b3da4a4a0cb577748c66bf2bf9e 22-Apr-2015 Brian Duff <bduff@google.com> am 63b42c8d: am 92f1bf25: Merge "Throw OutOfSpaceException instead of IllegalArgumentException."

* commit '63b42c8d7eb6b60fed296273513fc88b34b93469':
Throw OutOfSpaceException instead of IllegalArgumentException.
63b42c8d7eb6b60fed296273513fc88b34b93469 22-Apr-2015 Brian Duff <bduff@google.com> am 92f1bf25: Merge "Throw OutOfSpaceException instead of IllegalArgumentException."

* commit '92f1bf25e822eb156a57b7ede390efb89e283a87':
Throw OutOfSpaceException instead of IllegalArgumentException.
92f1bf25e822eb156a57b7ede390efb89e283a87 21-Apr-2015 Brian Duff <bduff@google.com> Merge "Throw OutOfSpaceException instead of IllegalArgumentException."
ebfc42610b47af51de7ce9eacc65960a80c6d490 21-Apr-2015 Charles Munger <clm@google.com> Throw OutOfSpaceException instead of IllegalArgumentException.

When a MessageNano containing a String is serialized into a buffer that
is too small to contain it, and the buffer's boundary happens to be
where the string field's length delimiting varint is serialized,
and the string's length and 3*length have the same length when
encoded as a varint, an IllegalArgumentException is thrown rather than
an OutOfSpaceException.

Github issue: https://github.com/google/protobuf/issues/292

Change-Id: If478d68cf15bfd0662252d008e42b2bf1ff1c75e
ava/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
2eadf946678a8a8d3cd56188454ab106b8dc5a39 20-Mar-2015 Brian Duff <bduff@google.com> Inline unknownFieldData{Equals,HashCode} to generated code.

It turns out dex (apparently) was inlining these protected final
methods from ExtendableMessageNano into every message class. Removing
these methods from the base class and inlining their code reduces
the method count by 2 methods / message when the store_unknown_fields
option is on.

Change-Id: I0aa09f2016d39939c4c8b8219601793b8fab301f
ava/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
ava/src/main/java/com/google/protobuf/nano/FieldArray.java
rc/google/protobuf/compiler/javanano/javanano_message.cc
001035d84dec844eac16037ac512ad9d35023ac9 06-Apr-2015 Jeff Davidson <jpd@google.com> am eff5d5b3: am 1d4b8b9f: am ff882b40: Merge "Generate a CREATOR for each Parcelable message."

* commit 'eff5d5b33b3ef8b655ce43e9f64578a8c8e4e482':
Generate a CREATOR for each Parcelable message.
eff5d5b33b3ef8b655ce43e9f64578a8c8e4e482 06-Apr-2015 Jeff Davidson <jpd@google.com> am 1d4b8b9f: am ff882b40: Merge "Generate a CREATOR for each Parcelable message."

* commit '1d4b8b9fc9950152a1b235dfc83cf613a3b18ca4':
Generate a CREATOR for each Parcelable message.
1d4b8b9fc9950152a1b235dfc83cf613a3b18ca4 06-Apr-2015 Jeff Davidson <jpd@google.com> am ff882b40: Merge "Generate a CREATOR for each Parcelable message."

* commit 'ff882b4094995bc7dd9b183951cf84aa04527361':
Generate a CREATOR for each Parcelable message.
ff882b4094995bc7dd9b183951cf84aa04527361 06-Apr-2015 Jeff Davidson <jpd@google.com> Merge "Generate a CREATOR for each Parcelable message."
bae6b59812ac972c9792605d521d6ada069288b2 02-Apr-2015 Jeff Davidson <jpd@google.com> Generate a CREATOR for each Parcelable message.

This is less ideal from a dex count perspective because it requires a
new variable for each message, and because most apps have proguard
rules that will ensure that CREATOR classes are retained.

However, it is required to be able to use nano protos inside of AIDL
files, as the autogenerated AIDL code fails to compile otherwise. This
is a substantial benefit as it allows for backwards-compatible
parameters and return types in AIDL methods along the lines of
safeparcel.

Bug: 19084705
Change-Id: I66a2c0424b96cf8ff6b631b186cc4f9407dfc1f4
ava/src/device/main/java/com/google/protobuf/nano/android/ParcelableExtendableMessageNano.java
ava/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNano.java
ava/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNanoCreator.java
ava/src/device/main/java/com/google/protobuf/nano/android/ParcelingUtil.java
rc/google/protobuf/compiler/javanano/javanano_message.cc
bd87b5ee4a3a8715784a6e12e97c898eff303e68 25-Mar-2015 Qiwen Zhao <zhao@google.com> am aba240b0: (-s ours) reset to 5cdb89e. DO NOT MERGE ANYWHERE.

* commit 'aba240b005645cc557b21cff484928c3024b0fc3':
aba240b005645cc557b21cff484928c3024b0fc3 25-Mar-2015 Qiwen Zhao <zhao@google.com> reset to 5cdb89e. DO NOT MERGE ANYWHERE.
e40224ab5a113158a1b429199dcd28d8680a7e6a 22-Mar-2015 Qiwen Zhao <zhao@google.com> am 25f140b3: (-s ours) Reset back to c6d612a. DO NOT MERGE ANYWHERE.

* commit '25f140b3e3d38af172ba484561a5da1667325629':
Inline unknownFieldData{Equals,HashCode} to generated code.
Expose generate_clear as an option.
25f140b3e3d38af172ba484561a5da1667325629 21-Mar-2015 Qiwen Zhao <zhao@google.com> Reset back to c6d612a. DO NOT MERGE ANYWHERE.
bd07121e9b71b85ecaae2d1ab38fd4bf551c316d 21-Mar-2015 Qiwen Zhao <zhao@google.com> reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.
27f6de2e0af57f115d5f52d90ef552a5179a9fed 21-Mar-2015 Brian Duff <bduff@google.com> am a20fd654: am c4e7b92f: Merge "Make the tag field public."

* commit 'a20fd65468ba6975aa65f1fe565d3dfd23207621':
Make the tag field public.
6bcc95f7df592ad6ca91527a294503afc27dcf6c 21-Mar-2015 Brian Duff <bduff@google.com> am 3f1b763a: am ddf016d8: Merge "Add MessageNano.messageNanoEquals()."

* commit '3f1b763ab7bc54eeaff1d1c8ed707746bfe8a088':
Add MessageNano.messageNanoEquals().
be3a18d1f871540519ac73efb4f420aef24a5be5 21-Mar-2015 Max Cai <maxtroy@google.com> am bb80065a: am 0068978c: Merge "Fixed octal printing of bytearrays"

* commit 'bb80065a75206799123bde22fdd533dfe3392e52':
Fixed octal printing of bytearrays
e72726879fac0251b48f910b9ec5adf241c75a53 21-Mar-2015 Max Cai <maxtroy@google.com> am d85ee8b8: am 77866143: Merge "Revert "Fixed octal printing of bytearrays""

* commit 'd85ee8b8cda8cba35a28952f0de9186abc3422c5':
Revert "Fixed octal printing of bytearrays"
b90a9c5e0e63897713837b067d92e61cbd24677c 21-Mar-2015 Max Cai <maxtroy@google.com> am a78c7868: am 238e0ac5: Merge "Fixed octal printing of bytearrays"

* commit 'a78c78688b1e79afc7cb67316ff7d104829d84fd':
Fixed octal printing of bytearrays
dd45d773be68e4237cf059d1a87fdaf45a951f88 21-Mar-2015 Max Cai <maxtroy@google.com> am bfe5b30e: am c6d612ac: am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData."

* commit 'bfe5b30ef488bbbfb3a52775d796d3b9e08e12c5':
a69ebb97c2f99ed1fe3bc8bbccfb60b73e7e9869 21-Mar-2015 Max Cai <maxtroy@google.com> am 1b3c7f48: am b172d667: am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to extension values."

* commit '1b3c7f48c93900ac850269004cfc96489f487861':
99dd6a5fd6a6aebaa735f960e79405b29aeb375a 21-Mar-2015 Ying Wang <wangying@google.com> am cb095d21: am e9d25570: am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT

* commit 'cb095d21de77c2f261dddf6402764f7868082615':
b2a6db32f529ed002b7aaab7afdb0bce172e63a7 21-Mar-2015 Baligh Uddin <baligh@google.com> am ca524e2f: am b088989c: am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce

* commit 'ca524e2f9e94099d2399d6487a4d9b6fe02509ed':
cb72d4ef9a2f5f9f69297434d68ebe96550730d4 21-Mar-2015 Wink Saville <wink@google.com> am 62a0f9d4: am b38ef83f: am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp

* commit '62a0f9d481ce6c5525dd93007afbdf092e011237':
2cfa663f10b8efaed85b5f83b48211da0228aa31 21-Mar-2015 Wink Saville <wink@google.com> am f95440f8: am 8add9962: am f13aadfb: am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict"

* commit 'f95440f837799b2ffa6aea68dbdb3251550a9b79':
2d53af1c3898c887d09e19ca8474c6b6e986a11c 21-Mar-2015 Jan-Willem Maarse <maarse@google.com> am 4344e415: am 1944e19c: am a3ab4364: am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"

* commit '4344e415b9ed3da78da50853e288aaec5cc515cb':
f9cc2573c56ab3e9d53c29a97f184bf40d8e55ca 21-Mar-2015 Bill Yi <byi@google.com> am 549268de: am 7f3f30e9: am d0f3ba60: am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD

* commit '549268de5c242ab7948b53bc5f8e8a83d33b72fe':
6e53d4ee1818e789a83e9a6ec1c35e22863c44ca 21-Mar-2015 Jeff Davidson <jpd@google.com> am 6d2d0f40: am 7bf58728: am 3656cc20: am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master

* commit '6d2d0f4023043221456fd263e33648b1ab6bc502':
489edaf6b15b5e5b163e1d5d010af0614f0e0d7d 21-Mar-2015 Max Cai <maxtroy@google.com> am 563f32c4: am ee16014e: am f613f9e7: am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"

* commit '563f32c433628a38440b1d799f52c1d4f889aaf3':
7e017918ffa7550b273767c6adf90af3e8fb5778 21-Mar-2015 Max Cai <maxtroy@google.com> am 0d0b3264: am 2b469993: am 61317c32: am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"

* commit '0d0b326431b54d4b59a3405a7c5c63f8ed4d3a8b':
082a8542d722ca2f0551ed1f58592df0ebd811dd 21-Mar-2015 Wink Saville <wink@google.com> am 985244ab: am dc946875: am 6eb7a519: am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""

* commit '985244abea85772c5fa4cae5012af903ca59a30a':
db862aa6d31101e41b859dcc41fb360053f2beef 21-Mar-2015 Wink Saville <wink@google.com> am 70f9fdd3: am 9160bc69: am 390b6c4b: am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflict

* commit '70f9fdd38c40a4cb1aaeeb34f45f087d23bdf549':
152b6785dc0ad0128913584ee47e4db74b5f573a 21-Mar-2015 Wink Saville <wink@google.com> am 75244665: am 89f0407f: am 232698c4: am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"

* commit '75244665e3b7d228b0887d0ff43a84a30c358f62':
e7cb41b538691984bd987df8e36c9570b69ef4db 21-Mar-2015 Wink Saville <wink@google.com> am 8345e3e6: am b28d1738: am 0cb1a2f6: am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"

* commit '8345e3e6d8965a5cc2aa7a3067f3e2b1e7b032f0':
038809f5a1ee2190c70598ff9cf3517260528f06 21-Mar-2015 Max Cai <maxtroy@google.com> am 5cba1b7d: am 339f5a6d: am 67584f49: am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."

* commit '5cba1b7dcad5909a72e940bc15a1480327d104fb':
841530e45144bf029c3fbf3b503308c40119a7ae 21-Mar-2015 Max Cai <maxtroy@google.com> am fc9b38a1: am 34559f88: am 1b9cb7b2: am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f

* commit 'fc9b38a1992610a6a0e3b51dad39901df293a980':
1e376c6d20bfec94454ab5be69741cb41b53f31b 21-Mar-2015 Jie Dai <jied@google.com> am 4cce7ca7: am 6f45464e: am 1af058a5: am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp

* commit '4cce7ca7d4cf026a62a1fd5b37b7e028040866da':
3caf5fa1104fb8793c75c5dc28917a0a081427d1 21-Mar-2015 Max Cai <maxtroy@google.com> am dc08aae5: am cb395443: am 5843426a: am 0c063c66: am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."

* commit 'dc08aae549f3a38bc6b1cc5a1facbbcadf4969f4':
5cda545b45c605962396f43c1e700afebd321b90 21-Mar-2015 Max Cai <maxtroy@google.com> am 99f1c88b: am c1d044c0: am d043ff9d: am 06396abf: am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."

* commit '99f1c88ba4039deed33328dea1e9dc38e8ca0134':
dcee657b8fef6f19df1a4c49f2158f8690e31a78 21-Mar-2015 Max Cai <maxtroy@google.com> am 2b0e6788: am ddf77b19: am b22123d1: am e41d4c04: am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."

* commit '2b0e6788f9eab2271b28591383ed7db2309e69d4':
783558da69d3274251132b18381f05931c01bb70 21-Mar-2015 Andrew Flynn <flynn@google.com> am 18072b1d: am a155ce7e: am 3628a851: am 11b030c3: am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"

* commit '18072b1d0063576040575f8970d36f11a8527fbc':
1f4d0f941c22604572b2ec3217fe46f3570436b0 21-Mar-2015 Max Cai <maxtroy@google.com> am 31111e30: am dad271e9: am a6ee3baf: am 843619f3: am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."

* commit '31111e302e14330c3868e6b1456dbe1e0293edef':
1d2342000cdeac544811cb984d2aacd15c16d4e3 21-Mar-2015 Max Cai <maxtroy@google.com> am 6a8d85c1: am 3a324516: am 01d1cdeb: am 175d44db: am aa721735: am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"

* commit '6a8d85c1211dd2382df6991db27872de8d990948':
a2f4f759e3a92a5238525e22795510ea1fa39fe8 21-Mar-2015 The Android Open Source Project <initial-contribution@android.com> am f29d4247: am 8d5b7fb2: am 23b66756: am bfa5ee2f: am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD

* commit 'f29d4247c76645649c4d205abaa22eeffe1f177d':
1661826ffab105719b2d6d159ab4e3c52b9fc5af 21-Mar-2015 The Android Open Source Project <initial-contribution@android.com> am ca65c1f6: am 6d879b4e: am e747813b: am 6a76a968: am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD

* commit 'ca65c1f662624e72dc2e2da0604d869972fc73ce':
a43bde0c4a6654501991c5fa995e075a40cb2931 21-Mar-2015 Max Cai <maxtroy@google.com> am 93f1f6d3: am a59cc53b: am c0bffb62: am fafcc5b4: am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."

* commit '93f1f6d36883ec801a0da383550f018f1b2db7b2':
3dd876dbd9e2180c01b35f6f0965dfebce5e25c9 21-Mar-2015 Max Cai <maxtroy@google.com> am 99a4ceca: am 9b078384: am 6ca2db13: am 7630b478: am f2d09988: am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."

* commit '99a4cecac63d2ee3d414712268ef2399807d6abd':
b84d917ecde04a986ae37fa1b65819f08a2b6e3c 21-Mar-2015 Max Cai <maxtroy@google.com> am 58437442: am 2267616c: am 8948d605: am 4d28b813: am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."

* commit '584374426b043bee782144bd58c14f2e612f56ef':
782461dcac99b097027736fbbe2e50fcd1fb7df7 21-Mar-2015 Max Cai <maxtroy@google.com> am 78d2cc9f: am 4b700b8a: am dce52afd: am fdf5bde4: am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."

* commit '78d2cc9fb3bf67926d6a2b76e76b6a32bc5d02c5':
e68ec8a20afd9879764f1c6f8aa14eb1f408492b 21-Mar-2015 Max Cai <maxtroy@google.com> am ea0f327a: am 438ca4a8: am f1c5cd09: am be303d03: am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."

* commit 'ea0f327a2fa5526267963b6215abb3bbd0e766b4':
6ab8161c2b960f595f5f0eae77d7df8cbb696d31 21-Mar-2015 Max Cai <maxtroy@google.com> am e4a89c5c: am 17395e55: am e668f0c3: am 2693b3aa: am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."

* commit 'e4a89c5c42e137fe793ed6ad26618b05188816e7':
962c0ed17fdd5fdd788ed5152de6fc449daf2ace 21-Mar-2015 Max Cai <maxtroy@google.com> am 405d0f3d: am 826b4cf5: am 74b536a5: am a84e8aa6: am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"

* commit '405d0f3dc1a68e94db6006fe5e92a1c9ae09928a':
6003213adaba74e279b79f1b6a3528063f9889f1 21-Mar-2015 Max Cai <maxtroy@google.com> am f7cab2e5: am 3c4cfdab: am 80fe1808: am c45fb6a2: am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."

* commit 'f7cab2e53d8cdef0cda6762fa92c0e4828f87d51':
f65bfdef158ff024c993558adabeadaf39c83a19 21-Mar-2015 Max Cai <maxtroy@google.com> am 42a70ce0: am 03016e74: am 2cb17b18: am b2a7fc6b: am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."

* commit '42a70ce03d0527ea9b7a1adcbfd0534f6c317c96':
7e1d4724b7e07e4cc6bb08cfadf0a863dc808cb8 21-Mar-2015 Max Cai <maxtroy@google.com> am 8aad5887: am fa0eb541: am bd188bc7: am ab8cc071: am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."

* commit '8aad5887d583c502da1ef6b8ab7fe7679e8114aa':
95366943e6f4805f0d9382d3090829d388a297d5 21-Mar-2015 Max Cai <maxtroy@google.com> am 33f1b41c: am eaac3e7b: am 4734b989: am aa2afb08: am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge

* commit '33f1b41c95115226f4168f76a5b0b5df391c81d8':
422594bb40b713f108fe054268d2cf32fc80e47a 21-Mar-2015 Max Cai <maxtroy@google.com> am 68d93707: am a61b2ef1: am e9056405: am 6ed6b682: am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."

* commit '68d93707a2112c3ab9c756146e6deddeaa837983':
28a20aeed1cf357b55cf2e9342a3bca210aee32a 21-Mar-2015 Ulas Kirazci <ulas@google.com> am 4a1053a6: am 056670c9: am e655a862: am f7bbfdfd: am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"

* commit '4a1053a6edd4c2dccbeb32ff4a48f186c0d59c23':
23e0ec83310595e799e085e11e1e6c7e07e93de0 21-Mar-2015 Ulas Kirazci <ulas@google.com> am 344082e2: am 73789372: am 8d2f4cf7: am ea95349d: am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."

* commit '344082e26086119c467ced1ebf31398e64fa7f1f':
6c15446a555889ce52bce7a930af54ce67cbd982 21-Mar-2015 Wink Saville <wink@google.com> am c3e15291: am 8973d9e6: am c6ec950e: am b624b3aa: am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"

* commit 'c3e152919fda9e43fbad1ff4a62a9e2d6838e3ee':
5fee0d703e573743236ec7d18c49822278c95339 21-Mar-2015 Ulas Kirazci <ulas@google.com> am 2f23eb57: am d8fbc188: am b42d5107: am a6ddccbb: am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."

* commit '2f23eb57f21af3a72e963b12ce55528dde067641':
2f0f0498b4c6ec8b896de248805afb31c419ddc0 21-Mar-2015 Ulas Kirazci <ulas@google.com> am 34ae47e2: am 8877603f: am 2b2d73d2: am a8b4f97f: am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."

* commit '34ae47e220c58578df1ca6edc9f7eed23debff55':
e2c44c46e0e55a0a3627c943e94c4d9d24cc2507 21-Mar-2015 Ulas Kirazci <ulas@google.com> am 62379d79: am dde8a694: am a19dbf97: am 6d1e9709: am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."

* commit '62379d790c1f33132185174dc73e8e36e032e08c':
63d235a4313f36287506bd0b242e2d0ab52121b4 21-Mar-2015 Ulas Kirazci <ulas@google.com> am b9c0728c: am 54ad71fb: am e6780389: am 998ea484: am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"

* commit 'b9c0728c4a1fedff1e9a6ab25eac3b0340b1ee10':
654b2ca78d0fa151ab08c6b04c7500d2abf8acf6 21-Mar-2015 Ulas Kirazci <ulas@google.com> am 6595b4bd: am 242aa182: am 5a9d43b2: am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."

* commit '6595b4bd220dd50da9868a4364e1ce34395a9716':
e2dcdb7a9a0a66e9ed43599334de36d92f856e5b 21-Mar-2015 Adam Metcalf <gamblore@google.com> am 0f5795bd: am cd22086d: am c0bc136b: am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the merge conflict leftovers.

* commit '0f5795bdbe62cf56c7ec8a5802ed82749d33794a':
1061f96528edac3aacd9521cbdc2d496d9651fd6 21-Mar-2015 Wink Saville <wink@google.com> am f091cdfb: am aa2e7e5f: am 3a2460f3: am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc

* commit 'f091cdfbea53190d0bd72cc0feb1da9634704268':
1d450be726a57c93bb884e42364d5f85c7acb803 21-Mar-2015 Wink Saville <wink@google.com> am 5e93722a: am ed67cd79: am d801ea90: am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit '5e93722ae156871e4c4e7df1f5f28936b68f299f':
d955d57a3b647c43c784b87158d06fcff8e382c0 21-Mar-2015 Wink Saville <wink@google.com> am 42f3fd77: am 1c524da8: am 9f4f73e2: am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."

* commit '42f3fd77fc8468420e747cba849e959432d84ef3':
ee79c7f93a60d58ac03c1c11ba6f64cf87658afb 21-Mar-2015 Wink Saville <wink@google.com> am a55aae90: am 3c00157e: am 02cba9f2: am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit 'a55aae90f695ea80b4c9d139ac41585e760528a2':
255aca2ec4fe0f930b84dd89886b95fcfaedb3ae 21-Mar-2015 Wink Saville <wink@google.com> am 1978393d: am a94fe6cb: am 7a8797ab: am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."

* commit '1978393dd2773ce523f35c15007b5ad91c5f25c2':
e9900b7ef4dd88a5e621dc105eddfbe425a5fa42 21-Mar-2015 Ying Wang <wangying@google.com> am 0f36c619: am b09fd32d: am f25e1e6b: am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"

* commit '0f36c61953ea1ba726aabb4fa81cd77b43784cb1':
e95fca42a42e15717eb9afcc27b0031736ec3ffe 21-Mar-2015 Max Cai <maxtroy@google.com> am 682363bc: am a76831c3: Merge "Fix how getRepeatedFieldArrayLength works"

* commit '682363bcf6addd6cdb822bc0fed5cd724ffe957d':
Fix how getRepeatedFieldArrayLength works
5b436ebbb3dcde564a47accffa3d207f813df645 21-Mar-2015 Sam Hasinoff <hasinoff@google.com> am d3518087: am f91b7fa1: Fix build, by using external/zlib instead of system zlib

* commit 'd35180871e469a79f0bec638693864f037ba4f2f':
f8172ce9bdb1b0898d79bf058e56bed44d85b019 21-Mar-2015 Leandro Gracia Gil <leandrogracia@google.com> am 3c1dbbae: am 4d11e705: Merge "Fix the aprotoc target for Windows."

* commit '3c1dbbae095cd8f4c354cf24e27c615c8e160bdc':
Fix the aprotoc target for Windows.
f210028d834fa773c0fb590bc992ed49de192f23 21-Mar-2015 Brian Duff <bduff@google.com> am f9b409e3: am 95d99df4: Merge "Don\'t return NULL from {Boxed}PrimitiveTypeName."

* commit 'f9b409e35963a357985ee687d096f8c166e0b80e':
Don't return NULL from {Boxed}PrimitiveTypeName.
6ba3235f63c0de70702d684e7c5f15c5f20f16fa 21-Mar-2015 Max Cai <maxtroy@google.com> am 60b72a8e: am 11607eb1: Merge "Add a hasExtension method to ExtendableMessageNano."

* commit '60b72a8ef366b27110e8a70caacb2fcd97e1ce92':
Add a hasExtension method to ExtendableMessageNano.
5cdb89e23d235c0cd715aefba443d8ad60492693 20-Mar-2015 Brian Duff <bduff@google.com> am 00c7607c: Merge "Inline unknownFieldData{Equals,HashCode} to generated code."

* commit '00c7607ce445af504021447068d6237ba8100716':
Inline unknownFieldData{Equals,HashCode} to generated code.
00c7607ce445af504021447068d6237ba8100716 20-Mar-2015 Brian Duff <bduff@google.com> Merge "Inline unknownFieldData{Equals,HashCode} to generated code."
02bf18fe1646f69c0d704b2e2886d308dfdfed5d 20-Mar-2015 Brian Duff <bduff@google.com> am 51e32ffa: Merge "Expose generate_clear as an option."

* commit '51e32ffaa5e2ea3528a58db5d34e8a0dc0a9ac93':
Expose generate_clear as an option.
0e2b47592a5af00251b2478542374a0f428ae4ee 20-Mar-2015 Brian Duff <bduff@google.com> Inline unknownFieldData{Equals,HashCode} to generated code.

It turns out dex (apparently) was inlining these protected final
methods from ExtendableMessageNano into every message class. Removing
these methods from the base class and inlining their code reduces
the method count by 2 methods / message when the store_unknown_fields
option is on.

Change-Id: I0aa09f2016d39939c4c8b8219601793b8fab301f
ava/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
ava/src/main/java/com/google/protobuf/nano/FieldArray.java
rc/google/protobuf/compiler/javanano/javanano_message.cc
51e32ffaa5e2ea3528a58db5d34e8a0dc0a9ac93 20-Mar-2015 Brian Duff <bduff@google.com> Merge "Expose generate_clear as an option."
847d91396504629dbfb3cd597acd61045dd630e2 13-Mar-2015 P.Y. Laligand <pylaligand@google.com> am bb555861: am 182e6d05: Merge "Added a build rule for the full version of the protocol buffer library."

* commit 'bb555861ba1bbe274c0fdcca8029fb8dffee9914':
Added a build rule for the full version of the protocol buffer library.
bb555861ba1bbe274c0fdcca8029fb8dffee9914 12-Mar-2015 P.Y. Laligand <pylaligand@google.com> am 182e6d05: Merge "Added a build rule for the full version of the protocol buffer library."

* commit '182e6d054c06f3a8e44cf9a09e14870366fa1190':
Added a build rule for the full version of the protocol buffer library.
182e6d054c06f3a8e44cf9a09e14870366fa1190 12-Mar-2015 P.Y. Laligand <pylaligand@google.com> Merge "Added a build rule for the full version of the protocol buffer library."
69463b21c8dcc156bcdaf18191d0d8076c5ac93d 12-Mar-2015 P.Y. Laligand <pylaligand@google.com> Added a build rule for the full version of the protocol buffer library.

Only added a host-side version as the full version is unlikely to be used on the device side.

b/19415609

Change-Id: Ibdd1ad589c2becff735a8cc72b7a7e5d89e45d3e
ndroid.mk
c8518963254eb51bd8ec52750c2cc487fa857c72 22-Feb-2015 Brian Duff <bduff@google.com> Expose generate_clear as an option.

I wasn't able to get the clear() method to inline into the
constructor when optimizations are on in proguard. As a result,
every message has an extra superfluous kept method assuming the
app never uses clear() directly.

There are a couple of instances where setting this option false is
necessary in order to get code dexing successfully without hitting
the method limit, e.g. https://goto.google.com/tltzq

In this example, I tried turning on the method/inlining/unique and
method/inlining/short optimizations before resorting to adding the
generate_clear option, but the method count did not decrease. The
clear() methods were contributing over a thousand extra methods.

Change-Id: If6a9651d6a59cdf70b1040d8248779710ac73105
rc/google/protobuf/compiler/javanano/javanano_generator.cc
decd20a067811244b705d3d3cd9e45fdb3081bb8 20-Feb-2015 Bill Yi <byi@google.com> am 77ba04d1: am ba4c97c2: Merge commit \'7304898f86cd6b2e525772e9cda4ba686b7d3fd2\' into HEAD

* commit '77ba04d15c46251eb63be4548abe754e20c37ddd':
77ba04d15c46251eb63be4548abe754e20c37ddd 20-Feb-2015 Bill Yi <byi@google.com> am ba4c97c2: Merge commit \'7304898f86cd6b2e525772e9cda4ba686b7d3fd2\' into HEAD

* commit 'ba4c97c2d3811c60ad95627927ad2fc72406fb27':
ba4c97c2d3811c60ad95627927ad2fc72406fb27 19-Feb-2015 Bill Yi <byi@google.com> Merge commit '7304898f86cd6b2e525772e9cda4ba686b7d3fd2' into HEAD
f0553c937cfe71f25027b6be9bb63554fbdd8b0b 19-Feb-2015 Jeff Davidson <jpd@google.com> am 0816d189: am 72b0f4cf: Merge "Generate @IntDef annotations for nanoproto enums."

* commit '0816d189919016880f36262e36b3a11407ead2b1':
Generate @IntDef annotations for nanoproto enums.
0816d189919016880f36262e36b3a11407ead2b1 19-Feb-2015 Jeff Davidson <jpd@google.com> am 72b0f4cf: Merge "Generate @IntDef annotations for nanoproto enums."

* commit '72b0f4cfbb910909f953c52ba7d097a6b3904cbb':
Generate @IntDef annotations for nanoproto enums.
72b0f4cfbb910909f953c52ba7d097a6b3904cbb 19-Feb-2015 Jeff Davidson <jpd@google.com> Merge "Generate @IntDef annotations for nanoproto enums."
30d873bd66f50a6021de5d44d7ee5b8a809b0524 11-Feb-2015 Jeff Davidson <jpd@google.com> Generate @IntDef annotations for nanoproto enums.

@IntDef is a support library annotation which allows build tools to
determine the valid set of values for a given integer field when that
field is intended to be restricted like an enum. This avoids the
overhead of enums while still allowing for compile-time type checking
in most circumstances.

Change-Id: Iee02e0b49a8e069f6456572f538e0a0d301fdfd5
ndroid.mk
ava/README.txt
rc/google/protobuf/compiler/javanano/javanano_enum.cc
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_params.h
aaa31cd17868b9cba27d70e33d008e72ba9f9c8b 17-Feb-2015 Brian Duff <bduff@google.com> am f1c606d9: am 971aedc7: Merge "Add reset() and position() to CodedOutputByteBufferNano."

* commit 'f1c606d95efbfdb7a028dff14f9e8773d30a63b4':
Add reset() and position() to CodedOutputByteBufferNano.
f1c606d95efbfdb7a028dff14f9e8773d30a63b4 17-Feb-2015 Brian Duff <bduff@google.com> am 971aedc7: Merge "Add reset() and position() to CodedOutputByteBufferNano."

* commit '971aedc78cbafac28e521808710574803708202f':
Add reset() and position() to CodedOutputByteBufferNano.
971aedc78cbafac28e521808710574803708202f 17-Feb-2015 Brian Duff <bduff@google.com> Merge "Add reset() and position() to CodedOutputByteBufferNano."
173957cc7c87dec3bf849fc1756a2ee1f22dcd5f 17-Feb-2015 Shai Barack <shayba@google.com> Add reset() and position() to CodedOutputByteBufferNano.

Change-Id: Ie2a9e36276ac35e10b3f8d379b5742d50a0374e9
ava/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java
02171de5bfb6030fd27fb8652bfab12fbf45ac2e 11-Feb-2015 Kweku Adams <kwekua@google.com> am 7304898f: (-s ours) am 46fe64be: DO NOT MERGE Overloading createMessageTyped to accept a tag as an integer.

* commit '7304898f86cd6b2e525772e9cda4ba686b7d3fd2':
DO NOT MERGE Overloading createMessageTyped to accept a tag as an integer.
3e0aea4a1b555d2e1b717c64a457f8e0a74b16cf 11-Feb-2015 Brian Duff <bduff@google.com> am 41f547ad: (-s ours) am aecce146: (-s ours) DO NOT MERGE Fix bug with large extension field numbers.

* commit '41f547ad14998a2834cff9e755cd019a059ae33d':
DO NOT MERGE Fix bug with large extension field numbers.
7304898f86cd6b2e525772e9cda4ba686b7d3fd2 11-Feb-2015 Kweku Adams <kwekua@google.com> am 46fe64be: DO NOT MERGE Overloading createMessageTyped to accept a tag as an integer.

* commit '46fe64be0fc97ba82c8ac34f700b43a5e1a7653d':
DO NOT MERGE Overloading createMessageTyped to accept a tag as an integer.
41f547ad14998a2834cff9e755cd019a059ae33d 11-Feb-2015 Brian Duff <bduff@google.com> am aecce146: (-s ours) DO NOT MERGE Fix bug with large extension field numbers.

* commit 'aecce146f3b94732d08ca796eb402575be6fd930':
DO NOT MERGE Fix bug with large extension field numbers.
46fe64be0fc97ba82c8ac34f700b43a5e1a7653d 13-Jan-2015 Kweku Adams <kwekua@google.com> DO NOT MERGE Overloading createMessageTyped to accept a tag as an integer.

When building, some instances expect createMessageTyped to have the signature
(int, Class, long), while others expect (int, Class, int). Simply having
the former signature meant that builds expecting the latter would fail.

This is a cherrypick of change b2a9d4321578139677c146ce37eba5e27e8f5c79
from master.

Change-Id: Ib02dbf66173510f4edea32c7b43e82c1a7a38aa2
ava/src/main/java/com/google/protobuf/nano/Extension.java
aecce146f3b94732d08ca796eb402575be6fd930 03-Oct-2014 Brian Duff <bduff@google.com> DO NOT MERGE Fix bug with large extension field numbers.

Previously, extensions with field numbers greater than 268435455 would
result in a compile time error in generated code that looks something
like this:

Foo.java:3178: error: integer number too large: 3346754610
3346754610);

This is because we were trying to represent the tag number (an
unsigned int) using a java int constant, but java int constants are
signed, and can't exceed Integer.MAX_VALUE.

Fixed by declaring it as a long instead, and casting it down to an
int in the implementation. This is safe, because the tag value always
fits in 32 bis.

This is a cherrypick of change b7cf53ba3b46eb17180465d3d3bb151fa4d93f3d
from master.

Change-Id: If2017bacb4e20af667eaeaf9b65ddc2c30a7709f
ava/src/main/java/com/google/protobuf/nano/Extension.java
rc/google/protobuf/compiler/javanano/javanano_extension.cc
rc/google/protobuf/unittest_extension_nano.proto
6257d7de246ed0ec1f4f33ab278da199c8a2e709 09-Feb-2015 Jeff Davidson <jpd@google.com> am 6d213787: am eb5ae9e2: Merge "Use libstdc++, not libc++_static, with protobuf."

* commit '6d2137875b5cf20938d68939de7aff254dc9fa22':
Use libstdc++, not libc++_static, with protobuf.
6d2137875b5cf20938d68939de7aff254dc9fa22 07-Feb-2015 Jeff Davidson <jpd@google.com> am eb5ae9e2: Merge "Use libstdc++, not libc++_static, with protobuf."

* commit 'eb5ae9e258a8fc953e6cf0b3a0dd04a112a05a3c':
Use libstdc++, not libc++_static, with protobuf.
eb5ae9e258a8fc953e6cf0b3a0dd04a112a05a3c 07-Feb-2015 Jeff Davidson <jpd@google.com> Merge "Use libstdc++, not libc++_static, with protobuf."
58e00bc69fc2e309384b09ec6088e65f3d322cd6 07-Feb-2015 Jeff Davidson <jpd@google.com> Use libstdc++, not libc++_static, with protobuf.

libc++_static causes problems with some windows builds. libstdc++
reverts back to the old behavior of using the system's libstdc++ (or
libc++ on darwin).

Bug: 19285118
Change-Id: Ib4fca25da24746e55b620db63f2f810ba3794f3d
ndroid.mk
00182a94542f14c9a8639efd77241cd4a2a5b047 06-Feb-2015 Jeff Davidson <jpd@google.com> am 7fc6e55f: am f2982dd2: Merge "Include libc++ statically in aprotoc."

* commit '7fc6e55f24336781e5bbfe47e0f1ed8608dde395':
Include libc++ statically in aprotoc.
7fc6e55f24336781e5bbfe47e0f1ed8608dde395 06-Feb-2015 Jeff Davidson <jpd@google.com> am f2982dd2: Merge "Include libc++ statically in aprotoc."

* commit 'f2982dd208b744cde5dd54dcd4b4c53f47f03712':
Include libc++ statically in aprotoc.
f2982dd208b744cde5dd54dcd4b4c53f47f03712 06-Feb-2015 Jeff Davidson <jpd@google.com> Merge "Include libc++ statically in aprotoc."
7b93f287c2bce7520f2a80d7c059415d31221f2a 06-Feb-2015 Jeff Davidson <jpd@google.com> Include libc++ statically in aprotoc.

Allows us to include aprotoc as a prebuilt separate from the platform
build for use in unbundled projects.

Bug: 19285118
Change-Id: I05f5dbf019ab08db31c33e7d30899189175a8315
ndroid.mk
803e1bbc8baa74b3e41230e3cec68b65e1e636f2 23-Jan-2015 Brian Duff <bduff@google.com> am bb2b6d9b: am 1c2c4706: Merge "Exclude cachedSize when printing fields."

* commit 'bb2b6d9bb01780ba28a0b9c42758468929a6c002':
Exclude cachedSize when printing fields.
d6973b18599ca53300e203336669f7077f4fa399 22-Jan-2015 Jeff Davidson <jpd@google.com> am 0fba86c6: am e6ae5ecf: Merge "Upgrade protobuf library to v2.6.1."

* commit '0fba86c685b6fd8b82055541012c1ab1efc370cd':
Upgrade protobuf library to v2.6.1.
bb2b6d9bb01780ba28a0b9c42758468929a6c002 22-Jan-2015 Brian Duff <bduff@google.com> am 1c2c4706: Merge "Exclude cachedSize when printing fields."

* commit '1c2c4706c4995122bb1271618511b27e84a9326a':
Exclude cachedSize when printing fields.
1c2c4706c4995122bb1271618511b27e84a9326a 22-Jan-2015 Brian Duff <bduff@google.com> Merge "Exclude cachedSize when printing fields."
d270ce1431d40af4caebdcac447cf762036ade1c 21-Jan-2015 Brian Duff <bduff@google.com> Exclude cachedSize when printing fields.

Change-Id: I85563b74237d38c1e447b7286f5f6e62d57e3d63
ava/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
0fba86c685b6fd8b82055541012c1ab1efc370cd 22-Jan-2015 Jeff Davidson <jpd@google.com> am e6ae5ecf: Merge "Upgrade protobuf library to v2.6.1."

* commit 'e6ae5ecfc360e1ad261b561c8e5e16b6554d5347':
Upgrade protobuf library to v2.6.1.
e6ae5ecfc360e1ad261b561c8e5e16b6554d5347 21-Jan-2015 Jeff Davidson <jpd@google.com> Merge "Upgrade protobuf library to v2.6.1."
afb4b72037e3f13db208590fc782c4bc8e27f862 20-Jan-2015 Jeff Davidson <jpd@google.com> Upgrade protobuf library to v2.6.1.

The previous commit was actually between v2.6.0 and v2.6.1. This CL
was created by generating a patch with:

git format-patch edc5994525c79cd1919859a370837a6ff7c8e308..v2.6.1

and applying this patch to the tree. The patch was clean except for
pom.xml, where the packaging type should have previously been changed
from "jar" to "bundle".

Reran ./configure && make -j12 check to regenerate configure script
and makefiles.

Change-Id: I817ff426c9a512cbda0246df5aee38f97e762dea
HANGES.txt
ONTRIBUTORS.txt
enchmarks/ProtoBench.java
onfig.h.in
onfigure
onfigure.ac
ditors/proto.vim
xamples/README.txt
xamples/list_people.cc
ava/README.txt
ava/pom.xml
ava/src/main/java/com/google/protobuf/AbstractMessage.java
ava/src/main/java/com/google/protobuf/AbstractMessageLite.java
ava/src/main/java/com/google/protobuf/AbstractParser.java
ava/src/main/java/com/google/protobuf/BlockingRpcChannel.java
ava/src/main/java/com/google/protobuf/BlockingService.java
ava/src/main/java/com/google/protobuf/BoundedByteString.java
ava/src/main/java/com/google/protobuf/ByteString.java
ava/src/main/java/com/google/protobuf/CodedInputStream.java
ava/src/main/java/com/google/protobuf/CodedOutputStream.java
ava/src/main/java/com/google/protobuf/Descriptors.java
ava/src/main/java/com/google/protobuf/DynamicMessage.java
ava/src/main/java/com/google/protobuf/Extension.java
ava/src/main/java/com/google/protobuf/ExtensionRegistry.java
ava/src/main/java/com/google/protobuf/ExtensionRegistryLite.java
ava/src/main/java/com/google/protobuf/FieldSet.java
ava/src/main/java/com/google/protobuf/GeneratedMessage.java
ava/src/main/java/com/google/protobuf/GeneratedMessageLite.java
ava/src/main/java/com/google/protobuf/Internal.java
ava/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java
ava/src/main/java/com/google/protobuf/LazyField.java
ava/src/main/java/com/google/protobuf/LazyFieldLite.java
ava/src/main/java/com/google/protobuf/LazyStringArrayList.java
ava/src/main/java/com/google/protobuf/LazyStringList.java
ava/src/main/java/com/google/protobuf/LiteralByteString.java
ava/src/main/java/com/google/protobuf/Message.java
ava/src/main/java/com/google/protobuf/MessageLite.java
ava/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java
ava/src/main/java/com/google/protobuf/MessageOrBuilder.java
ava/src/main/java/com/google/protobuf/MessageReflection.java
ava/src/main/java/com/google/protobuf/Parser.java
ava/src/main/java/com/google/protobuf/ProtocolMessageEnum.java
ava/src/main/java/com/google/protobuf/ProtocolStringList.java
ava/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java
ava/src/main/java/com/google/protobuf/RopeByteString.java
ava/src/main/java/com/google/protobuf/RpcCallback.java
ava/src/main/java/com/google/protobuf/RpcChannel.java
ava/src/main/java/com/google/protobuf/RpcController.java
ava/src/main/java/com/google/protobuf/RpcUtil.java
ava/src/main/java/com/google/protobuf/Service.java
ava/src/main/java/com/google/protobuf/ServiceException.java
ava/src/main/java/com/google/protobuf/SingleFieldBuilder.java
ava/src/main/java/com/google/protobuf/SmallSortedMap.java
ava/src/main/java/com/google/protobuf/TextFormat.java
ava/src/main/java/com/google/protobuf/UninitializedMessageException.java
ava/src/main/java/com/google/protobuf/UnknownFieldSet.java
ava/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java
ava/src/main/java/com/google/protobuf/Utf8.java
ava/src/main/java/com/google/protobuf/WireFormat.java
ava/src/test/java/com/google/protobuf/AbstractMessageTest.java
ava/src/test/java/com/google/protobuf/BoundedByteStringTest.java
ava/src/test/java/com/google/protobuf/ByteStringTest.java
ava/src/test/java/com/google/protobuf/CheckUtf8Test.java
ava/src/test/java/com/google/protobuf/CodedInputStreamTest.java
ava/src/test/java/com/google/protobuf/CodedOutputStreamTest.java
ava/src/test/java/com/google/protobuf/DeprecatedFieldTest.java
ava/src/test/java/com/google/protobuf/DescriptorsTest.java
ava/src/test/java/com/google/protobuf/DynamicMessageTest.java
ava/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java
ava/src/test/java/com/google/protobuf/GeneratedMessageTest.java
ava/src/test/java/com/google/protobuf/IsValidUtf8Test.java
ava/src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java
ava/src/test/java/com/google/protobuf/LazyFieldLiteTest.java
ava/src/test/java/com/google/protobuf/LazyFieldTest.java
ava/src/test/java/com/google/protobuf/LazyMessageLiteTest.java
ava/src/test/java/com/google/protobuf/LazyStringArrayListTest.java
ava/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java
ava/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java
ava/src/test/java/com/google/protobuf/LiteTest.java
ava/src/test/java/com/google/protobuf/LiteralByteStringTest.java
ava/src/test/java/com/google/protobuf/MessageTest.java
ava/src/test/java/com/google/protobuf/NestedBuildersTest.java
ava/src/test/java/com/google/protobuf/ParserTest.java
ava/src/test/java/com/google/protobuf/RepeatedFieldBuilderTest.java
ava/src/test/java/com/google/protobuf/RopeByteStringSubstringTest.java
ava/src/test/java/com/google/protobuf/RopeByteStringTest.java
ava/src/test/java/com/google/protobuf/ServiceTest.java
ava/src/test/java/com/google/protobuf/SingleFieldBuilderTest.java
ava/src/test/java/com/google/protobuf/SmallSortedMapTest.java
ava/src/test/java/com/google/protobuf/TestBadIdentifiers.java
ava/src/test/java/com/google/protobuf/TestUtil.java
ava/src/test/java/com/google/protobuf/TextFormatTest.java
ava/src/test/java/com/google/protobuf/UnknownFieldSetTest.java
ava/src/test/java/com/google/protobuf/UnmodifiableLazyStringListTest.java
ava/src/test/java/com/google/protobuf/WireFormatTest.java
ava/src/test/java/com/google/protobuf/lazy_fields_lite.proto
ava/src/test/java/com/google/protobuf/lite_equals_and_hash.proto
ava/src/test/java/com/google/protobuf/multiple_files_test.proto
ava/src/test/java/com/google/protobuf/nested_builders_test.proto
ava/src/test/java/com/google/protobuf/nested_extension.proto
ava/src/test/java/com/google/protobuf/nested_extension_lite.proto
ava/src/test/java/com/google/protobuf/non_nested_extension.proto
ava/src/test/java/com/google/protobuf/non_nested_extension_lite.proto
ava/src/test/java/com/google/protobuf/outer_class_name_test.proto
ava/src/test/java/com/google/protobuf/outer_class_name_test2.proto
ava/src/test/java/com/google/protobuf/outer_class_name_test3.proto
ava/src/test/java/com/google/protobuf/test_bad_identifiers.proto
ava/src/test/java/com/google/protobuf/test_check_utf8.proto
ava/src/test/java/com/google/protobuf/test_check_utf8_size.proto
ava/src/test/java/com/google/protobuf/test_custom_options.proto
ava/src/test/java/com/google/protobuf/test_extra_interfaces.proto
4/acx_check_suncc.m4
ython/README.txt
ython/google/protobuf/descriptor.py
ython/google/protobuf/descriptor_database.py
ython/google/protobuf/descriptor_pool.py
ython/google/protobuf/internal/api_implementation.cc
ython/google/protobuf/internal/api_implementation.py
ython/google/protobuf/internal/api_implementation_default_test.py
ython/google/protobuf/internal/containers.py
ython/google/protobuf/internal/cpp_message.py
ython/google/protobuf/internal/decoder.py
ython/google/protobuf/internal/descriptor_database_test.py
ython/google/protobuf/internal/descriptor_pool_test.py
ython/google/protobuf/internal/descriptor_pool_test1.proto
ython/google/protobuf/internal/descriptor_pool_test2.proto
ython/google/protobuf/internal/descriptor_python_test.py
ython/google/protobuf/internal/descriptor_test.py
ython/google/protobuf/internal/encoder.py
ython/google/protobuf/internal/enum_type_wrapper.py
ython/google/protobuf/internal/factory_test1.proto
ython/google/protobuf/internal/factory_test2.proto
ython/google/protobuf/internal/generator_test.py
ython/google/protobuf/internal/message_factory_python_test.py
ython/google/protobuf/internal/message_factory_test.py
ython/google/protobuf/internal/message_listener.py
ython/google/protobuf/internal/message_python_test.py
ython/google/protobuf/internal/message_test.py
ython/google/protobuf/internal/missing_enum_values.proto
ython/google/protobuf/internal/more_extensions.proto
ython/google/protobuf/internal/more_extensions_dynamic.proto
ython/google/protobuf/internal/more_messages.proto
ython/google/protobuf/internal/python_message.py
ython/google/protobuf/internal/reflection_test.py
ython/google/protobuf/internal/service_reflection_test.py
ython/google/protobuf/internal/symbol_database_test.py
ython/google/protobuf/internal/test_bad_identifiers.proto
ython/google/protobuf/internal/test_util.py
ython/google/protobuf/internal/text_encoding_test.py
ython/google/protobuf/internal/text_format_test.py
ython/google/protobuf/internal/type_checkers.py
ython/google/protobuf/internal/unknown_fields_test.py
ython/google/protobuf/internal/wire_format.py
ython/google/protobuf/internal/wire_format_test.py
ython/google/protobuf/message.py
ython/google/protobuf/message_factory.py
ython/google/protobuf/pyext/cpp_message.py
ython/google/protobuf/pyext/descriptor.cc
ython/google/protobuf/pyext/descriptor.h
ython/google/protobuf/pyext/descriptor_cpp2_test.py
ython/google/protobuf/pyext/extension_dict.cc
ython/google/protobuf/pyext/extension_dict.h
ython/google/protobuf/pyext/message.cc
ython/google/protobuf/pyext/message.h
ython/google/protobuf/pyext/message_factory_cpp2_test.py
ython/google/protobuf/pyext/proto2_api_test.proto
ython/google/protobuf/pyext/python.proto
ython/google/protobuf/pyext/python_protobuf.h
ython/google/protobuf/pyext/reflection_cpp2_generated_test.py
ython/google/protobuf/pyext/repeated_composite_container.cc
ython/google/protobuf/pyext/repeated_composite_container.h
ython/google/protobuf/pyext/repeated_scalar_container.cc
ython/google/protobuf/pyext/repeated_scalar_container.h
ython/google/protobuf/pyext/scoped_pyobject_ptr.h
ython/google/protobuf/reflection.py
ython/google/protobuf/service.py
ython/google/protobuf/service_reflection.py
ython/google/protobuf/symbol_database.py
ython/google/protobuf/text_encoding.py
ython/google/protobuf/text_format.py
ython/setup.py
rc/Makefile.am
rc/Makefile.in
rc/google/protobuf/compiler/code_generator.cc
rc/google/protobuf/compiler/code_generator.h
rc/google/protobuf/compiler/command_line_interface.cc
rc/google/protobuf/compiler/command_line_interface.h
rc/google/protobuf/compiler/command_line_interface_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_enum.cc
rc/google/protobuf/compiler/cpp/cpp_enum.h
rc/google/protobuf/compiler/cpp/cpp_enum_field.cc
rc/google/protobuf/compiler/cpp/cpp_enum_field.h
rc/google/protobuf/compiler/cpp/cpp_extension.cc
rc/google/protobuf/compiler/cpp/cpp_extension.h
rc/google/protobuf/compiler/cpp/cpp_field.cc
rc/google/protobuf/compiler/cpp/cpp_field.h
rc/google/protobuf/compiler/cpp/cpp_file.cc
rc/google/protobuf/compiler/cpp/cpp_file.h
rc/google/protobuf/compiler/cpp/cpp_generator.cc
rc/google/protobuf/compiler/cpp/cpp_generator.h
rc/google/protobuf/compiler/cpp/cpp_helpers.cc
rc/google/protobuf/compiler/cpp/cpp_helpers.h
rc/google/protobuf/compiler/cpp/cpp_message.cc
rc/google/protobuf/compiler/cpp/cpp_message.h
rc/google/protobuf/compiler/cpp/cpp_message_field.cc
rc/google/protobuf/compiler/cpp/cpp_message_field.h
rc/google/protobuf/compiler/cpp/cpp_options.h
rc/google/protobuf/compiler/cpp/cpp_plugin_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_primitive_field.cc
rc/google/protobuf/compiler/cpp/cpp_primitive_field.h
rc/google/protobuf/compiler/cpp/cpp_service.cc
rc/google/protobuf/compiler/cpp/cpp_service.h
rc/google/protobuf/compiler/cpp/cpp_string_field.cc
rc/google/protobuf/compiler/cpp/cpp_string_field.h
rc/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto
rc/google/protobuf/compiler/cpp/cpp_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_unittest.h
rc/google/protobuf/compiler/importer.cc
rc/google/protobuf/compiler/importer.h
rc/google/protobuf/compiler/importer_unittest.cc
rc/google/protobuf/compiler/java/java_context.cc
rc/google/protobuf/compiler/java/java_context.h
rc/google/protobuf/compiler/java/java_doc_comment.cc
rc/google/protobuf/compiler/java/java_doc_comment.h
rc/google/protobuf/compiler/java/java_doc_comment_unittest.cc
rc/google/protobuf/compiler/java/java_enum.cc
rc/google/protobuf/compiler/java/java_enum.h
rc/google/protobuf/compiler/java/java_enum_field.cc
rc/google/protobuf/compiler/java/java_enum_field.h
rc/google/protobuf/compiler/java/java_extension.cc
rc/google/protobuf/compiler/java/java_extension.h
rc/google/protobuf/compiler/java/java_field.cc
rc/google/protobuf/compiler/java/java_field.h
rc/google/protobuf/compiler/java/java_file.cc
rc/google/protobuf/compiler/java/java_file.h
rc/google/protobuf/compiler/java/java_generator.cc
rc/google/protobuf/compiler/java/java_generator.h
rc/google/protobuf/compiler/java/java_generator_factory.cc
rc/google/protobuf/compiler/java/java_generator_factory.h
rc/google/protobuf/compiler/java/java_helpers.cc
rc/google/protobuf/compiler/java/java_helpers.h
rc/google/protobuf/compiler/java/java_lazy_message_field.cc
rc/google/protobuf/compiler/java/java_lazy_message_field.h
rc/google/protobuf/compiler/java/java_message.cc
rc/google/protobuf/compiler/java/java_message.h
rc/google/protobuf/compiler/java/java_message_field.cc
rc/google/protobuf/compiler/java/java_message_field.h
rc/google/protobuf/compiler/java/java_name_resolver.cc
rc/google/protobuf/compiler/java/java_name_resolver.h
rc/google/protobuf/compiler/java/java_plugin_unittest.cc
rc/google/protobuf/compiler/java/java_primitive_field.cc
rc/google/protobuf/compiler/java/java_primitive_field.h
rc/google/protobuf/compiler/java/java_service.cc
rc/google/protobuf/compiler/java/java_service.h
rc/google/protobuf/compiler/java/java_shared_code_generator.cc
rc/google/protobuf/compiler/java/java_shared_code_generator.h
rc/google/protobuf/compiler/java/java_string_field.cc
rc/google/protobuf/compiler/java/java_string_field.h
rc/google/protobuf/compiler/main.cc
rc/google/protobuf/compiler/mock_code_generator.cc
rc/google/protobuf/compiler/mock_code_generator.h
rc/google/protobuf/compiler/package_info.h
rc/google/protobuf/compiler/parser.cc
rc/google/protobuf/compiler/parser.h
rc/google/protobuf/compiler/parser_unittest.cc
rc/google/protobuf/compiler/plugin.cc
rc/google/protobuf/compiler/plugin.h
rc/google/protobuf/compiler/plugin.pb.h
rc/google/protobuf/compiler/plugin.proto
rc/google/protobuf/compiler/python/python_generator.cc
rc/google/protobuf/compiler/python/python_generator.h
rc/google/protobuf/compiler/python/python_plugin_unittest.cc
rc/google/protobuf/compiler/subprocess.cc
rc/google/protobuf/compiler/subprocess.h
rc/google/protobuf/compiler/test_plugin.cc
rc/google/protobuf/compiler/zip_output_unittest.sh
rc/google/protobuf/compiler/zip_writer.cc
rc/google/protobuf/compiler/zip_writer.h
rc/google/protobuf/descriptor.cc
rc/google/protobuf/descriptor.h
rc/google/protobuf/descriptor.pb.h
rc/google/protobuf/descriptor.proto
rc/google/protobuf/descriptor_database.cc
rc/google/protobuf/descriptor_database.h
rc/google/protobuf/descriptor_database_unittest.cc
rc/google/protobuf/descriptor_pb2_test.py
rc/google/protobuf/descriptor_unittest.cc
rc/google/protobuf/dynamic_message.cc
rc/google/protobuf/dynamic_message.h
rc/google/protobuf/dynamic_message_unittest.cc
rc/google/protobuf/extension_set.cc
rc/google/protobuf/extension_set.h
rc/google/protobuf/extension_set_heavy.cc
rc/google/protobuf/extension_set_unittest.cc
rc/google/protobuf/generated_enum_reflection.h
rc/google/protobuf/generated_message_reflection.cc
rc/google/protobuf/generated_message_reflection.h
rc/google/protobuf/generated_message_reflection_unittest.cc
rc/google/protobuf/generated_message_util.cc
rc/google/protobuf/generated_message_util.h
rc/google/protobuf/io/coded_stream.cc
rc/google/protobuf/io/coded_stream.h
rc/google/protobuf/io/coded_stream_inl.h
rc/google/protobuf/io/coded_stream_unittest.cc
rc/google/protobuf/io/gzip_stream.cc
rc/google/protobuf/io/gzip_stream.h
rc/google/protobuf/io/gzip_stream_unittest.sh
rc/google/protobuf/io/package_info.h
rc/google/protobuf/io/printer.cc
rc/google/protobuf/io/printer.h
rc/google/protobuf/io/printer_unittest.cc
rc/google/protobuf/io/strtod.cc
rc/google/protobuf/io/strtod.h
rc/google/protobuf/io/tokenizer.cc
rc/google/protobuf/io/tokenizer.h
rc/google/protobuf/io/tokenizer_unittest.cc
rc/google/protobuf/io/zero_copy_stream.cc
rc/google/protobuf/io/zero_copy_stream.h
rc/google/protobuf/io/zero_copy_stream_impl.cc
rc/google/protobuf/io/zero_copy_stream_impl.h
rc/google/protobuf/io/zero_copy_stream_impl_lite.cc
rc/google/protobuf/io/zero_copy_stream_impl_lite.h
rc/google/protobuf/io/zero_copy_stream_unittest.cc
rc/google/protobuf/lite_unittest.cc
rc/google/protobuf/message.cc
rc/google/protobuf/message.h
rc/google/protobuf/message_lite.cc
rc/google/protobuf/message_lite.h
rc/google/protobuf/message_unittest.cc
rc/google/protobuf/package_info.h
rc/google/protobuf/reflection_ops.cc
rc/google/protobuf/reflection_ops.h
rc/google/protobuf/reflection_ops_unittest.cc
rc/google/protobuf/repeated_field.cc
rc/google/protobuf/repeated_field.h
rc/google/protobuf/repeated_field_reflection_unittest.cc
rc/google/protobuf/repeated_field_unittest.cc
rc/google/protobuf/service.cc
rc/google/protobuf/service.h
rc/google/protobuf/stubs/atomicops.h
rc/google/protobuf/stubs/atomicops_internals_arm64_gcc.h
rc/google/protobuf/stubs/atomicops_internals_arm_gcc.h
rc/google/protobuf/stubs/atomicops_internals_arm_qnx.h
rc/google/protobuf/stubs/atomicops_internals_atomicword_compat.h
rc/google/protobuf/stubs/atomicops_internals_generic_gcc.h
rc/google/protobuf/stubs/atomicops_internals_macosx.h
rc/google/protobuf/stubs/atomicops_internals_mips_gcc.h
rc/google/protobuf/stubs/atomicops_internals_pnacl.h
rc/google/protobuf/stubs/atomicops_internals_solaris.h
rc/google/protobuf/stubs/atomicops_internals_tsan.h
rc/google/protobuf/stubs/atomicops_internals_x86_gcc.cc
rc/google/protobuf/stubs/atomicops_internals_x86_gcc.h
rc/google/protobuf/stubs/atomicops_internals_x86_msvc.cc
rc/google/protobuf/stubs/atomicops_internals_x86_msvc.h
rc/google/protobuf/stubs/common.cc
rc/google/protobuf/stubs/common.h
rc/google/protobuf/stubs/common_unittest.cc
rc/google/protobuf/stubs/hash.h
rc/google/protobuf/stubs/map_util.h
rc/google/protobuf/stubs/once.cc
rc/google/protobuf/stubs/once.h
rc/google/protobuf/stubs/once_unittest.cc
rc/google/protobuf/stubs/platform_macros.h
rc/google/protobuf/stubs/shared_ptr.h
rc/google/protobuf/stubs/stl_util.h
rc/google/protobuf/stubs/stringprintf.cc
rc/google/protobuf/stubs/stringprintf.h
rc/google/protobuf/stubs/stringprintf_unittest.cc
rc/google/protobuf/stubs/strutil.cc
rc/google/protobuf/stubs/strutil.h
rc/google/protobuf/stubs/strutil_unittest.cc
rc/google/protobuf/stubs/substitute.cc
rc/google/protobuf/stubs/substitute.h
rc/google/protobuf/test_util.cc
rc/google/protobuf/test_util.h
rc/google/protobuf/test_util_lite.cc
rc/google/protobuf/test_util_lite.h
rc/google/protobuf/testing/file.cc
rc/google/protobuf/testing/file.h
rc/google/protobuf/testing/googletest.cc
rc/google/protobuf/testing/googletest.h
rc/google/protobuf/testing/zcgunzip.cc
rc/google/protobuf/testing/zcgzip.cc
rc/google/protobuf/text_format.cc
rc/google/protobuf/text_format.h
rc/google/protobuf/text_format_unittest.cc
rc/google/protobuf/unittest.proto
rc/google/protobuf/unittest_custom_options.proto
rc/google/protobuf/unittest_embed_optimize_for.proto
rc/google/protobuf/unittest_empty.proto
rc/google/protobuf/unittest_enormous_descriptor.proto
rc/google/protobuf/unittest_import.proto
rc/google/protobuf/unittest_import_lite.proto
rc/google/protobuf/unittest_import_public.proto
rc/google/protobuf/unittest_import_public_lite.proto
rc/google/protobuf/unittest_lite.proto
rc/google/protobuf/unittest_lite_imports_nonlite.proto
rc/google/protobuf/unittest_mset.proto
rc/google/protobuf/unittest_no_generic_services.proto
rc/google/protobuf/unittest_optimize_for.proto
rc/google/protobuf/unknown_field_set.cc
rc/google/protobuf/unknown_field_set.h
rc/google/protobuf/unknown_field_set_unittest.cc
rc/google/protobuf/wire_format.cc
rc/google/protobuf/wire_format.h
rc/google/protobuf/wire_format_lite.cc
rc/google/protobuf/wire_format_lite.h
rc/google/protobuf/wire_format_lite_inl.h
rc/google/protobuf/wire_format_unittest.cc
28cd95e332a7ccd6f7b55f42dc9f183da2c334b3 20-Jan-2015 Jeff Davidson <jpd@google.com> am 2429788d: am 80aff29b: Merge "Update protobuf\'s gtest to expected version."

* commit '2429788d4e969267e28ba708130e1f6f0d737a48':
Update protobuf's gtest to expected version.
2429788d4e969267e28ba708130e1f6f0d737a48 20-Jan-2015 Jeff Davidson <jpd@google.com> am 80aff29b: Merge "Update protobuf\'s gtest to expected version."

* commit '80aff29bb2d37977a02c0a677721522d3467a4d9':
Update protobuf's gtest to expected version.
80aff29bb2d37977a02c0a677721522d3467a4d9 20-Jan-2015 Jeff Davidson <jpd@google.com> Merge "Update protobuf's gtest to expected version."
0ddac1f3791efefb2cffdb425f0c600feb7a47e6 20-Jan-2015 Jeff Davidson <jpd@google.com> Update protobuf's gtest to expected version.

Generated by running:

rm -rf gtest
./autogen.sh
./configure

Change-Id: I5d9c0bea09dd9d3e4d7d4442dd8222011f5c522a
akefile.in
clocal.m4
ompile
onfig.guess
onfig.sub
onfigure
epcomp
test/CHANGES
test/CMakeLists.txt
test/CONTRIBUTORS
test/Makefile.am
test/Makefile.in
test/README
test/aclocal.m4
test/build-aux/compile
test/build-aux/config.guess
test/build-aux/config.sub
test/build-aux/depcomp
test/build-aux/install-sh
test/build-aux/ltmain.sh
test/build-aux/missing
test/build-aux/test-driver
test/codegear/gtest.groupproj
test/codegear/gtest_unittest.cbproj
test/configure
test/configure.ac
test/fused-src/gtest/gtest-all.cc
test/fused-src/gtest/gtest.h
test/fused-src/gtest/gtest_main.cc
test/include/gtest/gtest-death-test.h
test/include/gtest/gtest-message.h
test/include/gtest/gtest-param-test.h
test/include/gtest/gtest-param-test.h.pump
test/include/gtest/gtest-spi.h
test/include/gtest/gtest-test-part.h
test/include/gtest/gtest-typed-test.h
test/include/gtest/gtest.h
test/include/gtest/internal/gtest-death-test-internal.h
test/include/gtest/internal/gtest-filepath.h
test/include/gtest/internal/gtest-internal.h
test/include/gtest/internal/gtest-linked_ptr.h
test/include/gtest/internal/gtest-param-util-generated.h
test/include/gtest/internal/gtest-param-util-generated.h.pump
test/include/gtest/internal/gtest-param-util.h
test/include/gtest/internal/gtest-port.h
test/include/gtest/internal/gtest-string.h
test/include/gtest/internal/gtest-tuple.h
test/include/gtest/internal/gtest-tuple.h.pump
test/include/gtest/internal/gtest-type-util.h
test/include/gtest/internal/gtest-type-util.h.pump
test/make/Makefile
test/msvc/gtest-md.sln
test/msvc/gtest-md.vcproj
test/msvc/gtest.sln
test/msvc/gtest.vcproj
test/msvc/gtest_main-md.vcproj
test/msvc/gtest_main.vcproj
test/msvc/gtest_prod_test-md.vcproj
test/msvc/gtest_prod_test.vcproj
test/msvc/gtest_unittest-md.vcproj
test/msvc/gtest_unittest.vcproj
test/samples/prime_tables.h
test/samples/sample10_unittest.cc
test/samples/sample2.cc
test/samples/sample2.h
test/samples/sample2_unittest.cc
test/samples/sample3-inl.h
test/samples/sample3_unittest.cc
test/samples/sample5_unittest.cc
test/samples/sample7_unittest.cc
test/samples/sample8_unittest.cc
test/samples/sample9_unittest.cc
test/scons/SConscript
test/scons/SConstruct
test/scons/SConstruct.common
test/scripts/gtest-config.in
test/scripts/pump.py
test/src/gtest-all.cc
test/src/gtest-death-test.cc
test/src/gtest-filepath.cc
test/src/gtest-internal-inl.h
test/src/gtest-port.cc
test/src/gtest-test-part.cc
test/src/gtest-typed-test.cc
test/src/gtest.cc
test/test/gtest-death-test_test.cc
test/test/gtest-filepath_test.cc
test/test/gtest-listener_test.cc
test/test/gtest-message_test.cc
test/test/gtest-options_test.cc
test/test/gtest-param-test_test.cc
test/test/gtest-port_test.cc
test/test/gtest-test-part_test.cc
test/test/gtest-tuple_test.cc
test/test/gtest-typed-test_test.cc
test/test/gtest_all_test.cc
test/test/gtest_break_on_failure_unittest.py
test/test/gtest_break_on_failure_unittest_.cc
test/test/gtest_color_test_.cc
test/test/gtest_env_var_test.py
test/test/gtest_filter_unittest.py
test/test/gtest_help_test.py
test/test/gtest_help_test_.cc
test/test/gtest_nc.cc
test/test/gtest_nc_test.py
test/test/gtest_output_test.py
test/test/gtest_output_test_.cc
test/test/gtest_output_test_golden_lin.txt
test/test/gtest_shuffle_test.py
test/test/gtest_stress_test.cc
test/test/gtest_test_utils.py
test/test/gtest_unittest.cc
test/test/production.h
test/test/run_tests_util.py
test/test/run_tests_util_test.py
test/xcode/Config/General.xcconfig
test/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
test/xcode/Samples/FrameworkSample/runtests.sh
test/xcode/Samples/FrameworkSample/widget.cc
test/xcode/Samples/FrameworkSample/widget.h
test/xcode/Samples/FrameworkSample/widget_test.cc
test/xcode/Scripts/runtests.sh
test/xcode/Scripts/versiongenerate.py
nstall-sh
tmain.sh
4/libtool.m4
issing
rc/Makefile.in
est-driver
bc99582ac95aa3eff62d0a024a76ef27284cc6fc 16-Jan-2015 Jeff Davidson <jpd@google.com> Fix gradle builds of libprotobuf-lite.

Change-Id: I23f6ce1245e30624dafa102257e9cb6d6cf38af8
TODO: Move this into AOSP.
uild.gradle
c346ca161fce1976ee044960d7b0316767a91d31 16-Jan-2015 Jeff Davidson <jpd@google.com> am c4616e71: am 77a6b2f4: Merge "Update protobuf library from 2.3 to 2.6."

* commit 'c4616e7140586f06dce57a7fe970a22832f50ccc':
Update protobuf library from 2.3 to 2.6.
c4616e7140586f06dce57a7fe970a22832f50ccc 16-Jan-2015 Jeff Davidson <jpd@google.com> am 77a6b2f4: Merge "Update protobuf library from 2.3 to 2.6."

* commit '77a6b2f4cdd580d57630f079db1d908d7fd90a54':
Update protobuf library from 2.3 to 2.6.
77a6b2f4cdd580d57630f079db1d908d7fd90a54 15-Jan-2015 Jeff Davidson <jpd@google.com> Merge "Update protobuf library from 2.3 to 2.6."
a3b2a6da25a76f17c73d31def3952feb0fd2296e 16-Sep-2014 Jeff Davidson <jpd@google.com> Update protobuf library from 2.3 to 2.6.

Copied in all files from the open source protobuf project at commit
edc5994525c79cd1919859a370837a6ff7c8e308, removing files which have
been renamed (COPYING.txt -> LICENSE, README.txt -> README.md).

Removed 2.3 prebuilts, which is an approach that will not work due to
incompatibility with the 2.6 runtime.

Merged in micro/nano-specific changes in the following files:

-Android.mk - updated list of C++/Java sources, bumped versions
-java/README.txt - merged in micro/nano instructions, bumped versions
-java/pom.xml - merged in micro/nano build rules, set packaging to jar
-src/Makefile.am - merged in references to micro/nano generators
-src/google/protobuf/compiler/javamicro/javamicro_file.h - imported
google/protobuf/compiler/code_generator.h and removed redundant
OutputDirectory class.
-src/google/protobuf/compiler/javanano/javanano_file.h - same
-Replaced instances of vector with std::vector as needed to get
libprotobuf-cpp-full to compile. Plan to upstream this fix per
discussion with protobuf maintainers.

Reran autogen.sh to update ./configure and associated scripts.

Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48
ndroid.mk
HANGES.txt
ONTRIBUTORS.txt
OPYING.txt
ICENSE
ODULE_LICENSE_BSD_LIKE
akefile.am
akefile.in
EADME.md
EADME.txt
clocal.m4
utogen.sh
enchmarks/ProtoBench.java
enchmarks/google_message1.dat
enchmarks/google_message2.dat
enchmarks/google_size.proto
enchmarks/google_speed.proto
enchmarks/readme.txt
uild.gradle
onfig.guess
onfig.h.in
onfig.sub
onfigure
onfigure.ac
epcomp
ditors/proto.vim
xamples/AddPerson.java
xamples/list_people.cc
test/build-aux/config.guess
test/build-aux/config.sub
test/build-aux/depcomp
test/build-aux/install-sh
test/build-aux/missing
nstall-sh
ava/README.txt
ava/pom.xml
ava/src/main/java/com/google/protobuf/AbstractMessage.java
ava/src/main/java/com/google/protobuf/AbstractMessageLite.java
ava/src/main/java/com/google/protobuf/AbstractParser.java
ava/src/main/java/com/google/protobuf/BoundedByteString.java
ava/src/main/java/com/google/protobuf/ByteString.java
ava/src/main/java/com/google/protobuf/CodedInputStream.java
ava/src/main/java/com/google/protobuf/CodedOutputStream.java
ava/src/main/java/com/google/protobuf/Descriptors.java
ava/src/main/java/com/google/protobuf/DynamicMessage.java
ava/src/main/java/com/google/protobuf/Extension.java
ava/src/main/java/com/google/protobuf/ExtensionRegistry.java
ava/src/main/java/com/google/protobuf/ExtensionRegistryLite.java
ava/src/main/java/com/google/protobuf/FieldSet.java
ava/src/main/java/com/google/protobuf/GeneratedMessage.java
ava/src/main/java/com/google/protobuf/GeneratedMessageLite.java
ava/src/main/java/com/google/protobuf/Internal.java
ava/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java
ava/src/main/java/com/google/protobuf/LazyField.java
ava/src/main/java/com/google/protobuf/LazyFieldLite.java
ava/src/main/java/com/google/protobuf/LazyStringArrayList.java
ava/src/main/java/com/google/protobuf/LazyStringList.java
ava/src/main/java/com/google/protobuf/LiteralByteString.java
ava/src/main/java/com/google/protobuf/Message.java
ava/src/main/java/com/google/protobuf/MessageLite.java
ava/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java
ava/src/main/java/com/google/protobuf/MessageOrBuilder.java
ava/src/main/java/com/google/protobuf/MessageReflection.java
ava/src/main/java/com/google/protobuf/Parser.java
ava/src/main/java/com/google/protobuf/ProtocolStringList.java
ava/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java
ava/src/main/java/com/google/protobuf/RopeByteString.java
ava/src/main/java/com/google/protobuf/RpcUtil.java
ava/src/main/java/com/google/protobuf/ServiceException.java
ava/src/main/java/com/google/protobuf/SingleFieldBuilder.java
ava/src/main/java/com/google/protobuf/SmallSortedMap.java
ava/src/main/java/com/google/protobuf/TextFormat.java
ava/src/main/java/com/google/protobuf/UnknownFieldSet.java
ava/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java
ava/src/main/java/com/google/protobuf/Utf8.java
ava/src/main/java/com/google/protobuf/WireFormat.java
ava/src/test/java/com/google/protobuf/AbstractMessageTest.java
ava/src/test/java/com/google/protobuf/BoundedByteStringTest.java
ava/src/test/java/com/google/protobuf/ByteStringTest.java
ava/src/test/java/com/google/protobuf/CheckUtf8Test.java
ava/src/test/java/com/google/protobuf/CodedInputStreamTest.java
ava/src/test/java/com/google/protobuf/CodedOutputStreamTest.java
ava/src/test/java/com/google/protobuf/DeprecatedFieldTest.java
ava/src/test/java/com/google/protobuf/DescriptorsTest.java
ava/src/test/java/com/google/protobuf/DynamicMessageTest.java
ava/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java
ava/src/test/java/com/google/protobuf/GeneratedMessageTest.java
ava/src/test/java/com/google/protobuf/IsValidUtf8Test.java
ava/src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java
ava/src/test/java/com/google/protobuf/LazyFieldLiteTest.java
ava/src/test/java/com/google/protobuf/LazyFieldTest.java
ava/src/test/java/com/google/protobuf/LazyMessageLiteTest.java
ava/src/test/java/com/google/protobuf/LazyStringArrayListTest.java
ava/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java
ava/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java
ava/src/test/java/com/google/protobuf/LiteTest.java
ava/src/test/java/com/google/protobuf/LiteralByteStringTest.java
ava/src/test/java/com/google/protobuf/MessageTest.java
ava/src/test/java/com/google/protobuf/NestedBuildersTest.java
ava/src/test/java/com/google/protobuf/ParserTest.java
ava/src/test/java/com/google/protobuf/RepeatedFieldBuilderTest.java
ava/src/test/java/com/google/protobuf/RopeByteStringSubstringTest.java
ava/src/test/java/com/google/protobuf/RopeByteStringTest.java
ava/src/test/java/com/google/protobuf/ServiceTest.java
ava/src/test/java/com/google/protobuf/SingleFieldBuilderTest.java
ava/src/test/java/com/google/protobuf/SmallSortedMapTest.java
ava/src/test/java/com/google/protobuf/TestBadIdentifiers.java
ava/src/test/java/com/google/protobuf/TestUtil.java
ava/src/test/java/com/google/protobuf/TextFormatTest.java
ava/src/test/java/com/google/protobuf/UnknownFieldSetTest.java
ava/src/test/java/com/google/protobuf/UnmodifiableLazyStringListTest.java
ava/src/test/java/com/google/protobuf/WireFormatTest.java
ava/src/test/java/com/google/protobuf/lazy_fields_lite.proto
ava/src/test/java/com/google/protobuf/lite_equals_and_hash.proto
ava/src/test/java/com/google/protobuf/multiple_files_test.proto
ava/src/test/java/com/google/protobuf/nested_builders_test.proto
ava/src/test/java/com/google/protobuf/nested_extension.proto
ava/src/test/java/com/google/protobuf/nested_extension_lite.proto
ava/src/test/java/com/google/protobuf/non_nested_extension.proto
ava/src/test/java/com/google/protobuf/non_nested_extension_lite.proto
ava/src/test/java/com/google/protobuf/outer_class_name_test.proto
ava/src/test/java/com/google/protobuf/outer_class_name_test2.proto
ava/src/test/java/com/google/protobuf/outer_class_name_test3.proto
ava/src/test/java/com/google/protobuf/test_bad_identifiers.proto
ava/src/test/java/com/google/protobuf/test_check_utf8.proto
ava/src/test/java/com/google/protobuf/test_check_utf8_size.proto
ava/src/test/java/com/google/protobuf/test_custom_options.proto
ava/src/test/java/com/google/protobuf/test_extra_interfaces.proto
tmain.sh
4/acx_pthread.m4
4/libtool.m4
4/ltoptions.m4
4/ltsugar.m4
4/ltversion.m4
4/lt~obsolete.m4
4/stl_hash.m4
issing
ore_tests/Makefile
ost_process_dist.sh
rebuilts/Android.mk
rebuilts/arm/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
rebuilts/arm/libprotobuf-cpp-2.3.0-full.a
rebuilts/arm/libprotobuf-cpp-2.3.0-lite.a
rebuilts/arm64/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
rebuilts/arm64/libprotobuf-cpp-2.3.0-full.a
rebuilts/arm64/libprotobuf-cpp-2.3.0-lite.a
rebuilts/host-libprotobuf-java-2.3.0-lite.jar
rebuilts/host-libprotobuf-java-2.3.0-micro.jar
rebuilts/host-libprotobuf-java-2.3.0-nano.jar
rebuilts/libprotobuf-java-2.3.0-lite.jar
rebuilts/libprotobuf-java-2.3.0-micro.jar
rebuilts/libprotobuf-java-2.3.0-nano.jar
rebuilts/mips/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
rebuilts/mips/libprotobuf-cpp-2.3.0-full.a
rebuilts/mips/libprotobuf-cpp-2.3.0-lite.a
rebuilts/mips64/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
rebuilts/mips64/libprotobuf-cpp-2.3.0-full.a
rebuilts/mips64/libprotobuf-cpp-2.3.0-lite.a
rebuilts/x86/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
rebuilts/x86/libprotobuf-cpp-2.3.0-full.a
rebuilts/x86/libprotobuf-cpp-2.3.0-lite.a
rebuilts/x86_64/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
rebuilts/x86_64/libprotobuf-cpp-2.3.0-full.a
rebuilts/x86_64/libprotobuf-cpp-2.3.0-lite.a
rotobuf.pc.in
ython/README.txt
ython/ez_setup.py
ython/google/protobuf/descriptor.py
ython/google/protobuf/descriptor_database.py
ython/google/protobuf/descriptor_pool.py
ython/google/protobuf/internal/api_implementation.cc
ython/google/protobuf/internal/api_implementation.py
ython/google/protobuf/internal/api_implementation_default_test.py
ython/google/protobuf/internal/containers.py
ython/google/protobuf/internal/cpp_message.py
ython/google/protobuf/internal/decoder.py
ython/google/protobuf/internal/descriptor_database_test.py
ython/google/protobuf/internal/descriptor_pool_test.py
ython/google/protobuf/internal/descriptor_pool_test1.proto
ython/google/protobuf/internal/descriptor_pool_test2.proto
ython/google/protobuf/internal/descriptor_python_test.py
ython/google/protobuf/internal/descriptor_test.py
ython/google/protobuf/internal/encoder.py
ython/google/protobuf/internal/enum_type_wrapper.py
ython/google/protobuf/internal/factory_test1.proto
ython/google/protobuf/internal/factory_test2.proto
ython/google/protobuf/internal/generator_test.py
ython/google/protobuf/internal/message_factory_python_test.py
ython/google/protobuf/internal/message_factory_test.py
ython/google/protobuf/internal/message_python_test.py
ython/google/protobuf/internal/message_test.py
ython/google/protobuf/internal/missing_enum_values.proto
ython/google/protobuf/internal/more_extensions_dynamic.proto
ython/google/protobuf/internal/python_message.py
ython/google/protobuf/internal/reflection_test.py
ython/google/protobuf/internal/service_reflection_test.py
ython/google/protobuf/internal/symbol_database_test.py
ython/google/protobuf/internal/test_bad_identifiers.proto
ython/google/protobuf/internal/test_util.py
ython/google/protobuf/internal/text_encoding_test.py
ython/google/protobuf/internal/text_format_test.py
ython/google/protobuf/internal/type_checkers.py
ython/google/protobuf/internal/unknown_fields_test.py
ython/google/protobuf/internal/wire_format_test.py
ython/google/protobuf/message.py
ython/google/protobuf/message_factory.py
ython/google/protobuf/pyext/README
ython/google/protobuf/pyext/__init__.py
ython/google/protobuf/pyext/cpp_message.py
ython/google/protobuf/pyext/descriptor.cc
ython/google/protobuf/pyext/descriptor.h
ython/google/protobuf/pyext/descriptor_cpp2_test.py
ython/google/protobuf/pyext/extension_dict.cc
ython/google/protobuf/pyext/extension_dict.h
ython/google/protobuf/pyext/message.cc
ython/google/protobuf/pyext/message.h
ython/google/protobuf/pyext/message_factory_cpp2_test.py
ython/google/protobuf/pyext/proto2_api_test.proto
ython/google/protobuf/pyext/python.proto
ython/google/protobuf/pyext/python_protobuf.h
ython/google/protobuf/pyext/reflection_cpp2_generated_test.py
ython/google/protobuf/pyext/repeated_composite_container.cc
ython/google/protobuf/pyext/repeated_composite_container.h
ython/google/protobuf/pyext/repeated_scalar_container.cc
ython/google/protobuf/pyext/repeated_scalar_container.h
ython/google/protobuf/pyext/scoped_pyobject_ptr.h
ython/google/protobuf/reflection.py
ython/google/protobuf/symbol_database.py
ython/google/protobuf/text_encoding.py
ython/google/protobuf/text_format.py
ython/setup.py
rc/Makefile.am
rc/Makefile.in
rc/google/protobuf/SEBS
rc/google/protobuf/compiler/code_generator.cc
rc/google/protobuf/compiler/code_generator.h
rc/google/protobuf/compiler/command_line_interface.cc
rc/google/protobuf/compiler/command_line_interface.h
rc/google/protobuf/compiler/command_line_interface_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_enum.cc
rc/google/protobuf/compiler/cpp/cpp_enum.h
rc/google/protobuf/compiler/cpp/cpp_enum_field.cc
rc/google/protobuf/compiler/cpp/cpp_enum_field.h
rc/google/protobuf/compiler/cpp/cpp_extension.cc
rc/google/protobuf/compiler/cpp/cpp_extension.h
rc/google/protobuf/compiler/cpp/cpp_field.cc
rc/google/protobuf/compiler/cpp/cpp_field.h
rc/google/protobuf/compiler/cpp/cpp_file.cc
rc/google/protobuf/compiler/cpp/cpp_file.h
rc/google/protobuf/compiler/cpp/cpp_generator.cc
rc/google/protobuf/compiler/cpp/cpp_generator.h
rc/google/protobuf/compiler/cpp/cpp_helpers.cc
rc/google/protobuf/compiler/cpp/cpp_helpers.h
rc/google/protobuf/compiler/cpp/cpp_message.cc
rc/google/protobuf/compiler/cpp/cpp_message.h
rc/google/protobuf/compiler/cpp/cpp_message_field.cc
rc/google/protobuf/compiler/cpp/cpp_message_field.h
rc/google/protobuf/compiler/cpp/cpp_options.h
rc/google/protobuf/compiler/cpp/cpp_plugin_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_primitive_field.cc
rc/google/protobuf/compiler/cpp/cpp_primitive_field.h
rc/google/protobuf/compiler/cpp/cpp_service.cc
rc/google/protobuf/compiler/cpp/cpp_service.h
rc/google/protobuf/compiler/cpp/cpp_string_field.cc
rc/google/protobuf/compiler/cpp/cpp_string_field.h
rc/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto
rc/google/protobuf/compiler/cpp/cpp_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_unittest.h
rc/google/protobuf/compiler/importer.cc
rc/google/protobuf/compiler/importer.h
rc/google/protobuf/compiler/importer_unittest.cc
rc/google/protobuf/compiler/java/java_context.cc
rc/google/protobuf/compiler/java/java_context.h
rc/google/protobuf/compiler/java/java_doc_comment.cc
rc/google/protobuf/compiler/java/java_doc_comment.h
rc/google/protobuf/compiler/java/java_doc_comment_unittest.cc
rc/google/protobuf/compiler/java/java_enum.cc
rc/google/protobuf/compiler/java/java_enum.h
rc/google/protobuf/compiler/java/java_enum_field.cc
rc/google/protobuf/compiler/java/java_enum_field.h
rc/google/protobuf/compiler/java/java_extension.cc
rc/google/protobuf/compiler/java/java_extension.h
rc/google/protobuf/compiler/java/java_field.cc
rc/google/protobuf/compiler/java/java_field.h
rc/google/protobuf/compiler/java/java_file.cc
rc/google/protobuf/compiler/java/java_file.h
rc/google/protobuf/compiler/java/java_generator.cc
rc/google/protobuf/compiler/java/java_generator.h
rc/google/protobuf/compiler/java/java_generator_factory.cc
rc/google/protobuf/compiler/java/java_generator_factory.h
rc/google/protobuf/compiler/java/java_helpers.cc
rc/google/protobuf/compiler/java/java_helpers.h
rc/google/protobuf/compiler/java/java_lazy_message_field.cc
rc/google/protobuf/compiler/java/java_lazy_message_field.h
rc/google/protobuf/compiler/java/java_message.cc
rc/google/protobuf/compiler/java/java_message.h
rc/google/protobuf/compiler/java/java_message_field.cc
rc/google/protobuf/compiler/java/java_message_field.h
rc/google/protobuf/compiler/java/java_name_resolver.cc
rc/google/protobuf/compiler/java/java_name_resolver.h
rc/google/protobuf/compiler/java/java_plugin_unittest.cc
rc/google/protobuf/compiler/java/java_primitive_field.cc
rc/google/protobuf/compiler/java/java_primitive_field.h
rc/google/protobuf/compiler/java/java_service.cc
rc/google/protobuf/compiler/java/java_service.h
rc/google/protobuf/compiler/java/java_shared_code_generator.cc
rc/google/protobuf/compiler/java/java_shared_code_generator.h
rc/google/protobuf/compiler/java/java_string_field.cc
rc/google/protobuf/compiler/java/java_string_field.h
rc/google/protobuf/compiler/javamicro/javamicro_file.h
rc/google/protobuf/compiler/javanano/javanano_file.h
rc/google/protobuf/compiler/main.cc
rc/google/protobuf/compiler/mock_code_generator.cc
rc/google/protobuf/compiler/mock_code_generator.h
rc/google/protobuf/compiler/parser.cc
rc/google/protobuf/compiler/parser.h
rc/google/protobuf/compiler/parser_unittest.cc
rc/google/protobuf/compiler/plugin.cc
rc/google/protobuf/compiler/plugin.h
rc/google/protobuf/compiler/plugin.pb.cc
rc/google/protobuf/compiler/plugin.pb.h
rc/google/protobuf/compiler/plugin.proto
rc/google/protobuf/compiler/python/python_generator.cc
rc/google/protobuf/compiler/python/python_generator.h
rc/google/protobuf/compiler/python/python_plugin_unittest.cc
rc/google/protobuf/compiler/subprocess.cc
rc/google/protobuf/compiler/subprocess.h
rc/google/protobuf/compiler/zip_output_unittest.sh
rc/google/protobuf/compiler/zip_writer.cc
rc/google/protobuf/compiler/zip_writer.h
rc/google/protobuf/descriptor.cc
rc/google/protobuf/descriptor.h
rc/google/protobuf/descriptor.pb.cc
rc/google/protobuf/descriptor.pb.h
rc/google/protobuf/descriptor.proto
rc/google/protobuf/descriptor_database.cc
rc/google/protobuf/descriptor_database.h
rc/google/protobuf/descriptor_pb2_test.py
rc/google/protobuf/descriptor_unittest.cc
rc/google/protobuf/dynamic_message.cc
rc/google/protobuf/dynamic_message.h
rc/google/protobuf/dynamic_message_unittest.cc
rc/google/protobuf/extension_set.cc
rc/google/protobuf/extension_set.h
rc/google/protobuf/extension_set_heavy.cc
rc/google/protobuf/extension_set_unittest.cc
rc/google/protobuf/generated_enum_reflection.h
rc/google/protobuf/generated_message_reflection.cc
rc/google/protobuf/generated_message_reflection.h
rc/google/protobuf/generated_message_reflection_unittest.cc
rc/google/protobuf/generated_message_util.cc
rc/google/protobuf/generated_message_util.h
rc/google/protobuf/io/coded_stream.cc
rc/google/protobuf/io/coded_stream.h
rc/google/protobuf/io/coded_stream_inl.h
rc/google/protobuf/io/coded_stream_unittest.cc
rc/google/protobuf/io/gzip_stream.cc
rc/google/protobuf/io/gzip_stream.h
rc/google/protobuf/io/printer.cc
rc/google/protobuf/io/printer.h
rc/google/protobuf/io/printer_unittest.cc
rc/google/protobuf/io/strtod.cc
rc/google/protobuf/io/strtod.h
rc/google/protobuf/io/tokenizer.cc
rc/google/protobuf/io/tokenizer.h
rc/google/protobuf/io/tokenizer_unittest.cc
rc/google/protobuf/io/zero_copy_stream.cc
rc/google/protobuf/io/zero_copy_stream.h
rc/google/protobuf/io/zero_copy_stream_impl.cc
rc/google/protobuf/io/zero_copy_stream_impl.h
rc/google/protobuf/io/zero_copy_stream_impl_lite.cc
rc/google/protobuf/io/zero_copy_stream_impl_lite.h
rc/google/protobuf/io/zero_copy_stream_unittest.cc
rc/google/protobuf/lite_unittest.cc
rc/google/protobuf/message.cc
rc/google/protobuf/message.h
rc/google/protobuf/message_lite.cc
rc/google/protobuf/message_lite.h
rc/google/protobuf/message_unittest.cc
rc/google/protobuf/reflection_ops.cc
rc/google/protobuf/reflection_ops.h
rc/google/protobuf/reflection_ops_unittest.cc
rc/google/protobuf/repeated_field.cc
rc/google/protobuf/repeated_field.h
rc/google/protobuf/repeated_field_reflection_unittest.cc
rc/google/protobuf/repeated_field_unittest.cc
rc/google/protobuf/stubs/atomicops.h
rc/google/protobuf/stubs/atomicops_internals_arm64_gcc.h
rc/google/protobuf/stubs/atomicops_internals_arm_gcc.h
rc/google/protobuf/stubs/atomicops_internals_arm_qnx.h
rc/google/protobuf/stubs/atomicops_internals_atomicword_compat.h
rc/google/protobuf/stubs/atomicops_internals_generic_gcc.h
rc/google/protobuf/stubs/atomicops_internals_macosx.h
rc/google/protobuf/stubs/atomicops_internals_mips_gcc.h
rc/google/protobuf/stubs/atomicops_internals_pnacl.h
rc/google/protobuf/stubs/atomicops_internals_tsan.h
rc/google/protobuf/stubs/atomicops_internals_x86_gcc.cc
rc/google/protobuf/stubs/atomicops_internals_x86_gcc.h
rc/google/protobuf/stubs/atomicops_internals_x86_msvc.cc
rc/google/protobuf/stubs/atomicops_internals_x86_msvc.h
rc/google/protobuf/stubs/common.cc
rc/google/protobuf/stubs/common.h
rc/google/protobuf/stubs/common_unittest.cc
rc/google/protobuf/stubs/hash.h
rc/google/protobuf/stubs/map_util.h
rc/google/protobuf/stubs/once.cc
rc/google/protobuf/stubs/once.h
rc/google/protobuf/stubs/platform_macros.h
rc/google/protobuf/stubs/shared_ptr.h
rc/google/protobuf/stubs/stl_util.h
rc/google/protobuf/stubs/stringprintf.cc
rc/google/protobuf/stubs/stringprintf.h
rc/google/protobuf/stubs/stringprintf_unittest.cc
rc/google/protobuf/stubs/strutil.cc
rc/google/protobuf/stubs/strutil.h
rc/google/protobuf/stubs/strutil_unittest.cc
rc/google/protobuf/stubs/substitute.cc
rc/google/protobuf/stubs/template_util.h
rc/google/protobuf/stubs/template_util_unittest.cc
rc/google/protobuf/stubs/type_traits.h
rc/google/protobuf/stubs/type_traits_unittest.cc
rc/google/protobuf/test_util.cc
rc/google/protobuf/test_util.h
rc/google/protobuf/test_util_lite.cc
rc/google/protobuf/testdata/bad_utf8_string
rc/google/protobuf/testdata/golden_message
rc/google/protobuf/testdata/golden_message_oneof_implemented
rc/google/protobuf/testdata/text_format_unittest_data.txt
rc/google/protobuf/testdata/text_format_unittest_data_oneof_implemented.txt
rc/google/protobuf/testdata/text_format_unittest_data_pointy.txt
rc/google/protobuf/testdata/text_format_unittest_data_pointy_oneof.txt
rc/google/protobuf/testdata/text_format_unittest_extensions_data.txt
rc/google/protobuf/testdata/text_format_unittest_extensions_data_pointy.txt
rc/google/protobuf/testing/file.cc
rc/google/protobuf/testing/file.h
rc/google/protobuf/testing/googletest.cc
rc/google/protobuf/testing/googletest.h
rc/google/protobuf/text_format.cc
rc/google/protobuf/text_format.h
rc/google/protobuf/text_format_unittest.cc
rc/google/protobuf/unittest.proto
rc/google/protobuf/unittest_custom_options.proto
rc/google/protobuf/unittest_import.proto
rc/google/protobuf/unittest_import_lite.proto
rc/google/protobuf/unittest_import_public.proto
rc/google/protobuf/unittest_import_public_lite.proto
rc/google/protobuf/unittest_lite.proto
rc/google/protobuf/unittest_mset.proto
rc/google/protobuf/unittest_no_generic_services.proto
rc/google/protobuf/unittest_optimize_for.proto
rc/google/protobuf/unknown_field_set.cc
rc/google/protobuf/unknown_field_set.h
rc/google/protobuf/unknown_field_set_unittest.cc
rc/google/protobuf/wire_format.cc
rc/google/protobuf/wire_format.h
rc/google/protobuf/wire_format_lite.cc
rc/google/protobuf/wire_format_lite.h
rc/google/protobuf/wire_format_lite_inl.h
rc/google/protobuf/wire_format_unittest.cc
sprojects/extract_includes.bat
sprojects/libprotobuf-lite.vcproj
sprojects/libprotobuf.vcproj
sprojects/libprotoc.vcproj
sprojects/lite-test.vcproj
sprojects/protobuf.sln
sprojects/protoc.vcproj
sprojects/test_plugin.vcproj
sprojects/tests.vcproj
b2a9d4321578139677c146ce37eba5e27e8f5c79 13-Jan-2015 Kweku Adams <kwekua@google.com> Overloading createMessageTyped to accept a tag as an integer.

When building, some instances expect createMessageTyped to have the signature
(int, Class, long), while others expect (int, Class, int). Simply having
the former signature meant that builds expecting the latter would fail.

Change-Id: I27f73cc51bf9f24baf484b05f1a8df31c582d67d
ava/src/main/java/com/google/protobuf/nano/Extension.java
fbaf01eb356f558c258c213d71e8ed3bab9fce2f 09-Jan-2015 Brian Duff <bduff@google.com> am ba7476e9: am c7c25812: Merge "When no clear() is generated, still initialize fields."

* commit 'ba7476e9ecd2aca0301d1130f2696b642f8f58b4':
When no clear() is generated, still initialize fields.
ba7476e9ecd2aca0301d1130f2696b642f8f58b4 09-Jan-2015 Brian Duff <bduff@google.com> am c7c25812: Merge "When no clear() is generated, still initialize fields."

* commit 'c7c25812eb19d080087b71e08bfe35aff9f21433':
When no clear() is generated, still initialize fields.
c7c25812eb19d080087b71e08bfe35aff9f21433 09-Jan-2015 Brian Duff <bduff@google.com> Merge "When no clear() is generated, still initialize fields."
0d3500cb116b1d959f28ed4ad3ff41381d699aec 09-Jan-2015 Brian Duff <bduff@google.com> am 37f656ae: am 25794277: Merge "Add clone() method support for nano."

* commit '37f656ae430d63faa78c3af588963f73547e3ec0':
Add clone() method support for nano.
37f656ae430d63faa78c3af588963f73547e3ec0 09-Jan-2015 Brian Duff <bduff@google.com> am 25794277: Merge "Add clone() method support for nano."

* commit '25794277fd65aabe917fc6c01b3162e243740634':
Add clone() method support for nano.
25794277fd65aabe917fc6c01b3162e243740634 09-Jan-2015 Brian Duff <bduff@google.com> Merge "Add clone() method support for nano."
bcf45045f229edab8c2589c1f561e7b7495a763b 01-Oct-2014 Brian Duff <bduff@google.com> Add clone() method support for nano.

Upstreamed from Another Place (cr/57247854).

Change-Id: I2aaf59544c0f5ae21a51891d8a5eeda1dc722c90
ava/pom.xml
ava/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
ava/src/main/java/com/google/protobuf/nano/FieldArray.java
ava/src/main/java/com/google/protobuf/nano/FieldData.java
ava/src/main/java/com/google/protobuf/nano/InternalNano.java
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/main/java/com/google/protobuf/nano/UnknownFieldData.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_enum_field.h
rc/google/protobuf/compiler/javanano/javanano_field.h
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_message.h
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.h
rc/google/protobuf/compiler/javanano/javanano_params.h
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.h
rc/google/protobuf/unittest_extension_nano.proto
5537d6fe4af105eb769bacc530e8d5d9e0b027cb 09-Jan-2015 Brian Duff <bduff@google.com> When no clear() is generated, still initialize fields.

https://android-review.googlesource.com/#/c/67890/ removed field
initialization from the ctor, making it just call clear() instead.

When I added the generate_clear option back (as part of the reftypes
compat mode) in https://android-review.googlesource.com/#/c/109530/,
I forgot to ensure that what clear() used to do was inlined in the
constructor.

This change fixes NPEs that are happening for users of
reftypes_compat_mode who rely on unset repeated fields being empty
arrays rather than null.

Change-Id: Idb58746c60f4a4054b7ebb5c3b0e76b16ff88184
ava/pom.xml
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_message.h
00b70e0097b2091788ff59a2db5232a28e6edcf8 08-Jan-2015 Brian Duff <bduff@google.com> am d7966e27: am 3bd72e50: Merge "Fix comments."

* commit 'd7966e27317cdfee6f532370728bd824ab6b6827':
Fix comments.
d7966e27317cdfee6f532370728bd824ab6b6827 08-Jan-2015 Brian Duff <bduff@google.com> am 3bd72e50: Merge "Fix comments."

* commit '3bd72e5064459b54719b5ad95584f1fe1d299b8f':
Fix comments.
3bd72e5064459b54719b5ad95584f1fe1d299b8f 08-Jan-2015 Brian Duff <bduff@google.com> Merge "Fix comments."
8a9cb40e0eff7394223f8be997295749f1553c51 08-Jan-2015 Brian Duff <bduff@google.com> Fix comments.

Forgot to update these in https://android-review.googlesource.com/#/c/109809/

Change-Id: I53f838e2f134f53964161d9620d5ead00c4a3939
ava/src/main/java/com/google/protobuf/nano/Extension.java
2a53b90e1550a5ba8d3dae245ad6acc495867081 07-Jan-2015 Brian Duff <bduff@google.com> am ee425c88: am c35945d0: Merge "Optimize measurement and serialization of nano protos."

* commit 'ee425c88d49972cffb27b5f9d8351e805c1c9cca':
Optimize measurement and serialization of nano protos.
ee425c88d49972cffb27b5f9d8351e805c1c9cca 07-Jan-2015 Brian Duff <bduff@google.com> am c35945d0: Merge "Optimize measurement and serialization of nano protos."

* commit 'c35945d022afb86631adfc746254598c60323f72':
Optimize measurement and serialization of nano protos.
c35945d022afb86631adfc746254598c60323f72 07-Jan-2015 Brian Duff <bduff@google.com> Merge "Optimize measurement and serialization of nano protos."
bcf7a816ad9d435cd4562bdc722fd01100a918d7 29-Dec-2014 Charles Munger <clm@google.com> Optimize measurement and serialization of nano protos.

Measuring the serialized size of nano protos is now a zero-alloc operation, and serializing a proto now allocates no memory (other than the output buffer) instead of O(total length of strings).

Change-Id: Id5e2ac3bdc4ac56c0bf13d725472da3a00c9baec
Signed-off-by: Charles Munger <clm@google.com>
ava/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
4e6b346b0e43f805606b352432de9a4729bd2405 06-Jan-2015 Brian Duff <bduff@google.com> am 60e10a77: am 41be9083: Merge "Fix bug with large extension field numbers."

* commit '60e10a77c5ed3d0d34b97b1b7ed24bd8c36c7b58':
Fix bug with large extension field numbers.
60e10a77c5ed3d0d34b97b1b7ed24bd8c36c7b58 06-Jan-2015 Brian Duff <bduff@google.com> am 41be9083: Merge "Fix bug with large extension field numbers."

* commit '41be9083a4cef078c9a2e209ac99d065b5e71ad0':
Fix bug with large extension field numbers.
41be9083a4cef078c9a2e209ac99d065b5e71ad0 06-Jan-2015 Brian Duff <bduff@google.com> Merge "Fix bug with large extension field numbers."
7f7d3301202beb529049f9817411dd925d8eea01 11-Nov-2014 Dan Albert <danalbert@google.com> am db333f3e: am 4353bbc8: Merge "Add platform versions of the protobuf libraries."

* commit 'db333f3efc9081504a9bff5c9fbfe105134a29d7':
Add platform versions of the protobuf libraries.
db333f3efc9081504a9bff5c9fbfe105134a29d7 11-Nov-2014 Dan Albert <danalbert@google.com> am 4353bbc8: Merge "Add platform versions of the protobuf libraries."

* commit '4353bbc88f513a3c8863cc5b30e765dd5530faa1':
Add platform versions of the protobuf libraries.
4353bbc88f513a3c8863cc5b30e765dd5530faa1 11-Nov-2014 Dan Albert <danalbert@google.com> Merge "Add platform versions of the protobuf libraries."
0c44a2d48095860ad077ab6ef82468900eb1171d 11-Nov-2014 Dan Albert <danalbert@google.com> Add platform versions of the protobuf libraries.

NDK libraries should not be linked in to platform code, so create a
separate version for the platform that is linked against libc++
instead of the NDK STLs.

Bug: 15193147
Change-Id: I3935e5dd3bd99676772a4b9681e275ef3601b855
ndroid.mk
a22e6111f4786242d50276e46de04e400c5db3ae 06-Nov-2014 Behrooz Khorashadi <behrooz@google.com> am d65f73b7: am 123e5376: am dbb9c303: Merge "Added an API method in FieldData to allow access to the UnknownField data"

* commit 'd65f73b790d28e2b28238005cfa7ceb5e9e32aae':
Added an API method in FieldData to allow access to the UnknownField data
d65f73b790d28e2b28238005cfa7ceb5e9e32aae 06-Nov-2014 Behrooz Khorashadi <behrooz@google.com> am 123e5376: am dbb9c303: Merge "Added an API method in FieldData to allow access to the UnknownField data"

* commit '123e5376117dece4db60c4f28fd77f03a9ba4acb':
Added an API method in FieldData to allow access to the UnknownField data
123e5376117dece4db60c4f28fd77f03a9ba4acb 06-Nov-2014 Behrooz Khorashadi <behrooz@google.com> am dbb9c303: Merge "Added an API method in FieldData to allow access to the UnknownField data"

* commit 'dbb9c3033097e571e15c16d6e2e814be7e9d60bc':
Added an API method in FieldData to allow access to the UnknownField data
dbb9c3033097e571e15c16d6e2e814be7e9d60bc 06-Nov-2014 Behrooz Khorashadi <behrooz@google.com> Merge "Added an API method in FieldData to allow access to the UnknownField data"
b804c689e40caa1d3b77cd24ec4453dc9060d222 30-Oct-2014 Behrooz Khorashadi <behrooz@google.com> Added an API method in FieldData to allow access to the UnknownField data

Change-Id: I2cd5cfc80dce2a297fcd2511074b2a9d23d39837
ava/src/main/java/com/google/protobuf/nano/FieldData.java
40b53b8015a47ee18ce0cc3eeb401c54f28bb777 29-Oct-2014 Jeff Davidson <jpd@google.com> am 6c9657cb: am a12fbb0a: am 1ed1ec36: Merge "Move protobuf 2.3.0 to prebuilts."

* commit '6c9657cbf6f8cc8a89a0552b322cc617d40fba54':
Move protobuf 2.3.0 to prebuilts.
6c9657cbf6f8cc8a89a0552b322cc617d40fba54 29-Oct-2014 Jeff Davidson <jpd@google.com> am a12fbb0a: am 1ed1ec36: Merge "Move protobuf 2.3.0 to prebuilts."

* commit 'a12fbb0a425580dc03d2947faa79530e38b08b54':
Move protobuf 2.3.0 to prebuilts.
a12fbb0a425580dc03d2947faa79530e38b08b54 29-Oct-2014 Jeff Davidson <jpd@google.com> am 1ed1ec36: Merge "Move protobuf 2.3.0 to prebuilts."

* commit '1ed1ec3609812a7818689cde01b6ce92d3f2315a':
Move protobuf 2.3.0 to prebuilts.
1ed1ec3609812a7818689cde01b6ce92d3f2315a 28-Oct-2014 Jeff Davidson <jpd@google.com> Merge "Move protobuf 2.3.0 to prebuilts."
14a6d4e3bb2758495b4a00f43fa9bfe275d3ad0e 26-Oct-2014 Brian Duff <bduff@google.com> am acf18f47: am 78c25630: am 9be7e740: Merge "Change reftypes_primitive_enums to reftypes_compat_mode."

* commit 'acf18f474bd167e0aa05d51cccae32b974993863':
f8069b17e3e0bc557be6ec6ea8492eaf4df15b64 26-Oct-2014 Brian Duff <bduff@google.com> am 0a10b445: am c6547047: am 7d1ca13f: Merge "Adds a primitive enum mode for reftypes."

* commit '0a10b445d99ba82a81c6fc19b98c54976a98a447':
94ba4c13a0f7a7c787f411ce4b2c340e41be2e90 26-Oct-2014 Brian Duff <bduff@google.com> am 3033a8dd: am 278f6dcc: am d3a8acb9: Merge "Includes a MessageNano subclass\'s name\'s hashCode in hashCode calculations."

* commit '3033a8ddfeb57238fa01af1af909cdb5072a5d42':
acf18f474bd167e0aa05d51cccae32b974993863 26-Oct-2014 Brian Duff <bduff@google.com> am 78c25630: am 9be7e740: Merge "Change reftypes_primitive_enums to reftypes_compat_mode."

* commit '78c2563026edf1f2a7119650b069ac1bb9cc230d':
0a10b445d99ba82a81c6fc19b98c54976a98a447 26-Oct-2014 Brian Duff <bduff@google.com> am c6547047: am 7d1ca13f: Merge "Adds a primitive enum mode for reftypes."

* commit 'c654704764a270f2307e1330f439c302dae6638d':
3033a8ddfeb57238fa01af1af909cdb5072a5d42 26-Oct-2014 Brian Duff <bduff@google.com> am 278f6dcc: am d3a8acb9: Merge "Includes a MessageNano subclass\'s name\'s hashCode in hashCode calculations."

* commit '278f6dcc643dad84eb40779aec1e0ae20ea2185b':
18007b8462bc2f361ac9fbf89e434dd5d4e3649a 16-Oct-2014 Jeff Davidson <jpd@google.com> Move protobuf 2.3.0 to prebuilts.

This will facilitate an upgrade to 2.6.0 and future versions without
breaking applications which have a hardcoded dependency on 2.3.0. The
existing make rules have been renamed to omit the version code.

The prebuilts were built from a tree at commit
9be7e7401174d75e87e21fdc5f43549594a714bb.

Change-Id: I90cf7f029217c8dc63a4b38252025c6b725d72a5
gitignore
ndroid.mk
rebuilts/Android.mk
rebuilts/arm/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
rebuilts/arm/libprotobuf-cpp-2.3.0-full.a
rebuilts/arm/libprotobuf-cpp-2.3.0-lite.a
rebuilts/arm64/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
rebuilts/arm64/libprotobuf-cpp-2.3.0-full.a
rebuilts/arm64/libprotobuf-cpp-2.3.0-lite.a
rebuilts/host-libprotobuf-java-2.3.0-lite.jar
rebuilts/host-libprotobuf-java-2.3.0-micro.jar
rebuilts/host-libprotobuf-java-2.3.0-nano.jar
rebuilts/libprotobuf-java-2.3.0-lite.jar
rebuilts/libprotobuf-java-2.3.0-micro.jar
rebuilts/libprotobuf-java-2.3.0-nano.jar
rebuilts/mips/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
rebuilts/mips/libprotobuf-cpp-2.3.0-full.a
rebuilts/mips/libprotobuf-cpp-2.3.0-lite.a
rebuilts/mips64/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
rebuilts/mips64/libprotobuf-cpp-2.3.0-full.a
rebuilts/mips64/libprotobuf-cpp-2.3.0-lite.a
rebuilts/x86/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
rebuilts/x86/libprotobuf-cpp-2.3.0-full.a
rebuilts/x86/libprotobuf-cpp-2.3.0-lite.a
rebuilts/x86_64/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
rebuilts/x86_64/libprotobuf-cpp-2.3.0-full.a
rebuilts/x86_64/libprotobuf-cpp-2.3.0-lite.a
b7cf53ba3b46eb17180465d3d3bb151fa4d93f3d 03-Oct-2014 Brian Duff <bduff@google.com> Fix bug with large extension field numbers.

Previously, extensions with field numbers greater than 268435455 would
result in a compile time error in generated code that looks something
like this:

Foo.java:3178: error: integer number too large: 3346754610
3346754610);

This is because we were trying to represent the tag number (an
unsigned int) using a java int constant, but java int constants are
signed, and can't exceed Integer.MAX_VALUE.

Fixed by declaring it as a long instead, and casting it down to an
int in the implementation. This is safe, because the tag value always
fits in 32 bis.

Change-Id: If2017bacb4e20af667eaeaf9b65ddc2c30a7709f
ava/src/main/java/com/google/protobuf/nano/Extension.java
rc/google/protobuf/compiler/javanano/javanano_extension.cc
rc/google/protobuf/unittest_extension_nano.proto
ba87b7a4980fd4d4bcd23ef58c6e49ee2bb70a53 03-Oct-2014 Brian Duff <bduff@google.com> am 423db53c: am 9be7e740: Merge "Change reftypes_primitive_enums to reftypes_compat_mode."

* commit '423db53c8f3321f60fa4d68ee91c9fb329c0d2ce':
Change reftypes_primitive_enums to reftypes_compat_mode.
78c2563026edf1f2a7119650b069ac1bb9cc230d 03-Oct-2014 Brian Duff <bduff@google.com> am 9be7e740: Merge "Change reftypes_primitive_enums to reftypes_compat_mode."

* commit '9be7e7401174d75e87e21fdc5f43549594a714bb':
Change reftypes_primitive_enums to reftypes_compat_mode.
423db53c8f3321f60fa4d68ee91c9fb329c0d2ce 03-Oct-2014 Brian Duff <bduff@google.com> am 9be7e740: Merge "Change reftypes_primitive_enums to reftypes_compat_mode."

* commit '9be7e7401174d75e87e21fdc5f43549594a714bb':
Change reftypes_primitive_enums to reftypes_compat_mode.
9be7e7401174d75e87e21fdc5f43549594a714bb 03-Oct-2014 Brian Duff <bduff@google.com> Merge "Change reftypes_primitive_enums to reftypes_compat_mode."
907e776a4015b6b55987f008429ba66babb920a1 01-Oct-2014 Brian Duff <bduff@google.com> Change reftypes_primitive_enums to reftypes_compat_mode.

Make the clear() method stripped in reftypes_compat_mode.

Change-Id: I0ec35537856f59a6ecf231bfd74df995c858e2b2
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_params.h
9b9a94c18bc21dfa4cff0e79380d8ceb2f3955cd 01-Oct-2014 Brian Duff <bduff@google.com> am c910f80e: am 7d1ca13f: Merge "Adds a primitive enum mode for reftypes."

* commit 'c910f80e2cfc3fbedb26d7f2088ccf03a917c86e':
Adds a primitive enum mode for reftypes.
c910f80e2cfc3fbedb26d7f2088ccf03a917c86e 01-Oct-2014 Brian Duff <bduff@google.com> am 7d1ca13f: Merge "Adds a primitive enum mode for reftypes."

* commit '7d1ca13f3781e8ccff0ecfab42250f1058c9152d':
Adds a primitive enum mode for reftypes.
c654704764a270f2307e1330f439c302dae6638d 01-Oct-2014 Brian Duff <bduff@google.com> am 7d1ca13f: Merge "Adds a primitive enum mode for reftypes."

* commit '7d1ca13f3781e8ccff0ecfab42250f1058c9152d':
Adds a primitive enum mode for reftypes.
7d1ca13f3781e8ccff0ecfab42250f1058c9152d 01-Oct-2014 Brian Duff <bduff@google.com> Merge "Adds a primitive enum mode for reftypes."
339478eea8a7889d1c086d216f72fa63c1b5307d 30-Sep-2014 Brian Duff <bduff@google.com> Adds a primitive enum mode for reftypes.

This is a compatibility shim.

Change-Id: Ia0b417d4621e391ede618d0b3b1c470c9896e0ff
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_params.h
e60ab4798e8cf4b04f35c5a6cf7fdfd134495b43 19-Sep-2014 Brian Duff <bduff@google.com> am 562c96ed: am d3a8acb9: Merge "Includes a MessageNano subclass\'s name\'s hashCode in hashCode calculations."

* commit '562c96edd21cb1e94556df7b760f184f544ee269':
48689c6dbb2f00676701afdfb6f469b5cf2177c2 17-Sep-2014 Brian Duff <bduff@google.com> am 278f6dcc: am d3a8acb9: Merge "Includes a MessageNano subclass\'s name\'s hashCode in hashCode calculations."

* commit '278f6dcc643dad84eb40779aec1e0ae20ea2185b':
Includes a MessageNano subclass's name's hashCode in hashCode calculations.
562c96edd21cb1e94556df7b760f184f544ee269 17-Sep-2014 Brian Duff <bduff@google.com> am d3a8acb9: Merge "Includes a MessageNano subclass\'s name\'s hashCode in hashCode calculations."

* commit 'd3a8acb9a2b3695955c77f364b3a6bd2f1c189bc':
Includes a MessageNano subclass's name's hashCode in hashCode calculations.
278f6dcc643dad84eb40779aec1e0ae20ea2185b 17-Sep-2014 Brian Duff <bduff@google.com> am d3a8acb9: Merge "Includes a MessageNano subclass\'s name\'s hashCode in hashCode calculations."

* commit 'd3a8acb9a2b3695955c77f364b3a6bd2f1c189bc':
Includes a MessageNano subclass's name's hashCode in hashCode calculations.
d3a8acb9a2b3695955c77f364b3a6bd2f1c189bc 17-Sep-2014 Brian Duff <bduff@google.com> Merge "Includes a MessageNano subclass's name's hashCode in hashCode calculations."
d0a645c06c723bb309b78af8598ac51d1567f773 17-Sep-2014 Jason Neufeld <jneufeld@google.com> Includes a MessageNano subclass's name's hashCode in hashCode calculations.

In the current implementation, a message with the same amount of null or
equal-valued fields as a different message type will have the same
hashCode. This adds more variety by including the hashCode of the
class's name in the hashCode calculations.

Change-Id: I284e3e6d198ad8037815948d1f65686465ffd623
Signed-off-by: Jason Neufeld <jneufeld@google.com>
rc/google/protobuf/compiler/javanano/javanano_message.cc
e334e64e9ac3fd22499e787342d613ce30b6b241 03-Sep-2014 Brian Duff <bduff@google.com> am a20fd654: am c4e7b92f: Merge "Make the tag field public."

* commit 'a20fd65468ba6975aa65f1fe565d3dfd23207621':
Make the tag field public.
a20fd65468ba6975aa65f1fe565d3dfd23207621 03-Sep-2014 Brian Duff <bduff@google.com> am c4e7b92f: Merge "Make the tag field public."

* commit 'c4e7b92fefce5b069f50659363c8878612303510':
Make the tag field public.
c4e7b92fefce5b069f50659363c8878612303510 03-Sep-2014 Brian Duff <bduff@google.com> Merge "Make the tag field public."
55f02be99a19b69c8e67c253688bc42994b595f7 03-Sep-2014 Brian Duff <bduff@google.com> am 3f1b763a: am ddf016d8: Merge "Add MessageNano.messageNanoEquals()."

* commit '3f1b763ab7bc54eeaff1d1c8ed707746bfe8a088':
Add MessageNano.messageNanoEquals().
22e1d28ae620379d3a5544dbedcbe725f4a46967 03-Sep-2014 Brian Duff <bduff@google.com> Make the tag field public.

Change-Id: Ibfda5bb1ac3150ea90d82a152730be76a2f8bf71
ava/src/main/java/com/google/protobuf/nano/Extension.java
3f1b763ab7bc54eeaff1d1c8ed707746bfe8a088 03-Sep-2014 Brian Duff <bduff@google.com> am ddf016d8: Merge "Add MessageNano.messageNanoEquals()."

* commit 'ddf016d828d928eefbce89c602c323bf0f998574':
Add MessageNano.messageNanoEquals().
ddf016d828d928eefbce89c602c323bf0f998574 03-Sep-2014 Brian Duff <bduff@google.com> Merge "Add MessageNano.messageNanoEquals()."
a882d4b4b6801edb1e67fb17632d2da50ba22266 22-Jul-2014 Brian Duff <bduff@google.com> Add MessageNano.messageNanoEquals().

Allows two messages to be compared directly for equality without
generating an equals method for every generated message.

(Ports CL58125010)

Change-Id: I92ab5088539d1fd722fee7b5e28a8c825926c3b6
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
ef6e1bf5ff143cdee7b5e53062ce7c3d09726b77 29-Aug-2014 Max Cai <maxtroy@google.com> am bb80065a: am 0068978c: Merge "Fixed octal printing of bytearrays"

* commit 'bb80065a75206799123bde22fdd533dfe3392e52':
Fixed octal printing of bytearrays
bb80065a75206799123bde22fdd533dfe3392e52 29-Aug-2014 Max Cai <maxtroy@google.com> am 0068978c: Merge "Fixed octal printing of bytearrays"

* commit '0068978c364173b15a9cb8ab65fb2d2eac17f136':
Fixed octal printing of bytearrays
0068978c364173b15a9cb8ab65fb2d2eac17f136 29-Aug-2014 Max Cai <maxtroy@google.com> Merge "Fixed octal printing of bytearrays"
b0431df904df8feb42ecd4bc8f698ba72c7f18b7 29-Aug-2014 Max Cai <maxtroy@google.com> am d85ee8b8: am 77866143: Merge "Revert "Fixed octal printing of bytearrays""

* commit 'd85ee8b8cda8cba35a28952f0de9186abc3422c5':
Revert "Fixed octal printing of bytearrays"
b317dfbcca7240aa4b33305293cb0eeb29f220a1 29-Aug-2014 Max Cai <maxtroy@google.com> am a78c7868: am 238e0ac5: Merge "Fixed octal printing of bytearrays"

* commit 'a78c78688b1e79afc7cb67316ff7d104829d84fd':
Fixed octal printing of bytearrays
d85ee8b8cda8cba35a28952f0de9186abc3422c5 29-Aug-2014 Max Cai <maxtroy@google.com> am 77866143: Merge "Revert "Fixed octal printing of bytearrays""

* commit '77866143340f7541180d91fa316071ce947b3a8d':
Revert "Fixed octal printing of bytearrays"
a78c78688b1e79afc7cb67316ff7d104829d84fd 29-Aug-2014 Max Cai <maxtroy@google.com> am 238e0ac5: Merge "Fixed octal printing of bytearrays"

* commit '238e0ac56654afadb5270264660db7305f139c02':
Fixed octal printing of bytearrays
f56bd09ac980fcde8b6af4e3fbd5bf9c97fc9199 29-Aug-2014 Linus Tufvesson <lus@google.com> Fixed octal printing of bytearrays

- Now with 50% less '&' and 100% fewer build breakages!

Change-Id: Icf0283220f75cd14b8564b51bd55973e5b7da56b
ava/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
77866143340f7541180d91fa316071ce947b3a8d 28-Aug-2014 Max Cai <maxtroy@google.com> Merge "Revert "Fixed octal printing of bytearrays""
c9c2ffc3c005fbcaac2d0f91094bdb1928cb309e 28-Aug-2014 Max Cai <maxtroy@google.com> Revert "Fixed octal printing of bytearrays"

This reverts commit 8b8481868877c9db407d04bdf4843e50d8920806.

Change-Id: I0876235b79cd7745312879d0f1b00c6d1c1a1b7a
ava/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
238e0ac56654afadb5270264660db7305f139c02 28-Aug-2014 Max Cai <maxtroy@google.com> Merge "Fixed octal printing of bytearrays"
8b8481868877c9db407d04bdf4843e50d8920806 28-Aug-2014 Linus Tufvesson <lus@google.com> Fixed octal printing of bytearrays

Change-Id: Ia848d7fae9aeab89e65b00f05cee6c1e6d649d94
ava/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
97c71ed12de2e675a337642f68a63f3176e896f6 21-Aug-2014 Max Cai <maxtroy@google.com> am bfe5b30e: am c6d612ac: am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData."

* commit 'bfe5b30ef488bbbfb3a52775d796d3b9e08e12c5':
8b2fd767db739707a739b82b3e0e07bb13e4d69e 21-Aug-2014 Max Cai <maxtroy@google.com> am 1b3c7f48: am b172d667: am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to extension values."

* commit '1b3c7f48c93900ac850269004cfc96489f487861':
0a02519fed7a0d675cf616f1c54a4ebc2e4465c4 21-Aug-2014 Ying Wang <wangying@google.com> am cb095d21: am e9d25570: am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT

* commit 'cb095d21de77c2f261dddf6402764f7868082615':
0a7b2aae94925aad37b860382cd6b9f345387817 21-Aug-2014 Baligh Uddin <baligh@google.com> am ca524e2f: am b088989c: am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce

* commit 'ca524e2f9e94099d2399d6487a4d9b6fe02509ed':
269b023a72c83135e798e1a92750a62dd405d159 21-Aug-2014 Wink Saville <wink@google.com> am 62a0f9d4: am b38ef83f: am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp

* commit '62a0f9d481ce6c5525dd93007afbdf092e011237':
af60b0d3397e1d38ffb90689b920920712ffad08 21-Aug-2014 Wink Saville <wink@google.com> am f95440f8: am 8add9962: am f13aadfb: am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict"

* commit 'f95440f837799b2ffa6aea68dbdb3251550a9b79':
6e52bb01d505808f389531b4751e14606ec7d8ac 21-Aug-2014 Jan-Willem Maarse <maarse@google.com> am 4344e415: am 1944e19c: am a3ab4364: am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"

* commit '4344e415b9ed3da78da50853e288aaec5cc515cb':
0da85d50de4f6afa5ded3e6bb5aeefbaaeb1371f 21-Aug-2014 Bill Yi <byi@google.com> am 549268de: am 7f3f30e9: am d0f3ba60: am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD

* commit '549268de5c242ab7948b53bc5f8e8a83d33b72fe':
02de479ccc80c8bf5c75b795f3fb8006bf393f61 21-Aug-2014 Jeff Davidson <jpd@google.com> am 6d2d0f40: am 7bf58728: am 3656cc20: am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master

* commit '6d2d0f4023043221456fd263e33648b1ab6bc502':
1caffa5504b1ebc03f292db5ee27aa88daf15571 21-Aug-2014 Max Cai <maxtroy@google.com> am 563f32c4: am ee16014e: am f613f9e7: am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"

* commit '563f32c433628a38440b1d799f52c1d4f889aaf3':
18755cc4ac864d12a0dc28aa9c244db083d0ff4c 21-Aug-2014 Max Cai <maxtroy@google.com> am 0d0b3264: am 2b469993: am 61317c32: am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"

* commit '0d0b326431b54d4b59a3405a7c5c63f8ed4d3a8b':
beb3aabd8b74272f6e46f1c09679f1fe76e35d83 21-Aug-2014 Wink Saville <wink@google.com> am 985244ab: am dc946875: am 6eb7a519: am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""

* commit '985244abea85772c5fa4cae5012af903ca59a30a':
eb0c409165d874359c3c8b0d3d626ec963d1de78 21-Aug-2014 Wink Saville <wink@google.com> am 70f9fdd3: am 9160bc69: am 390b6c4b: am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflict

* commit '70f9fdd38c40a4cb1aaeeb34f45f087d23bdf549':
bfe5b30ef488bbbfb3a52775d796d3b9e08e12c5 21-Aug-2014 Max Cai <maxtroy@google.com> am c6d612ac: am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData."

* commit 'c6d612ac7b18ba758c9067136c1217589aa5796f':
1b3c7f48c93900ac850269004cfc96489f487861 21-Aug-2014 Max Cai <maxtroy@google.com> am b172d667: am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to extension values."

* commit 'b172d66772c921589a1338f00b34ff5bc3bcc225':
cb095d21de77c2f261dddf6402764f7868082615 21-Aug-2014 Ying Wang <wangying@google.com> am e9d25570: am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT

* commit 'e9d25570a8f67156a77260176b4a7a6f008e156c':
ca524e2f9e94099d2399d6487a4d9b6fe02509ed 21-Aug-2014 Baligh Uddin <baligh@google.com> am b088989c: am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce

* commit 'b088989c421c7d7379632ffb4f1fdc221ed9d2c9':
62a0f9d481ce6c5525dd93007afbdf092e011237 21-Aug-2014 Wink Saville <wink@google.com> am b38ef83f: am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp

* commit 'b38ef83f969221c2cbb891e609bb80f7a53a034d':
f95440f837799b2ffa6aea68dbdb3251550a9b79 21-Aug-2014 Wink Saville <wink@google.com> am 8add9962: am f13aadfb: am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict"

* commit '8add9962a5c88ff307d573be91bb091a2b14568d':
4344e415b9ed3da78da50853e288aaec5cc515cb 21-Aug-2014 Jan-Willem Maarse <maarse@google.com> am 1944e19c: am a3ab4364: am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"

* commit '1944e19cb1dc82a52d46a42fe8a0ed4037602565':
549268de5c242ab7948b53bc5f8e8a83d33b72fe 21-Aug-2014 Bill Yi <byi@google.com> am 7f3f30e9: am d0f3ba60: am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD

* commit '7f3f30e96965e7189430e4acc53520275627264c':
6d2d0f4023043221456fd263e33648b1ab6bc502 21-Aug-2014 Jeff Davidson <jpd@google.com> am 7bf58728: am 3656cc20: am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master

* commit '7bf587289933768ada48e79cf43deecfad65c576':
563f32c433628a38440b1d799f52c1d4f889aaf3 21-Aug-2014 Max Cai <maxtroy@google.com> am ee16014e: am f613f9e7: am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"

* commit 'ee16014efd4d8a9aff0fd6efc40782ce250a1cd8':
0d0b326431b54d4b59a3405a7c5c63f8ed4d3a8b 21-Aug-2014 Max Cai <maxtroy@google.com> am 2b469993: am 61317c32: am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"

* commit '2b4699938126550d4e6ba7a3e0f70672c2625c20':
985244abea85772c5fa4cae5012af903ca59a30a 21-Aug-2014 Wink Saville <wink@google.com> am dc946875: am 6eb7a519: am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""

* commit 'dc94687566ba7d98f65e4769d9c0e7d2f20ce895':
70f9fdd38c40a4cb1aaeeb34f45f087d23bdf549 21-Aug-2014 Wink Saville <wink@google.com> am 9160bc69: am 390b6c4b: am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflict

* commit '9160bc69c92253ddcdbe30a6737adc2bcc515c66':
c6d612ac7b18ba758c9067136c1217589aa5796f 21-Aug-2014 Max Cai <maxtroy@google.com> am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData."

* commit 'ecb2c88b22ad898c088a81870f58adbf4e16d126':
Fix access around unknownFieldData.
b172d66772c921589a1338f00b34ff5bc3bcc225 21-Aug-2014 Max Cai <maxtroy@google.com> am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to extension values."

* commit '2e6d4ae02a955d33a75c0642b8ffead20e11fd9a':
Keep pointers to extension values.
e9d25570a8f67156a77260176b4a7a6f008e156c 21-Aug-2014 Ying Wang <wangying@google.com> am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT

* commit 'cca3823db855ecbcad350332a274f253be7e9662':
b088989c421c7d7379632ffb4f1fdc221ed9d2c9 21-Aug-2014 Baligh Uddin <baligh@google.com> am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce

* commit '57e2ee788511ddc26e694cc783d3e95b52f0e0d4':
b38ef83f969221c2cbb891e609bb80f7a53a034d 21-Aug-2014 Wink Saville <wink@google.com> am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp

* commit '1f8913765270e9d90ad7384156629e116236355d':
8add9962a5c88ff307d573be91bb091a2b14568d 21-Aug-2014 Wink Saville <wink@google.com> am f13aadfb: am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict"

* commit 'f13aadfb6dfc707520809dbf4502e3001fd1424b':
1944e19cb1dc82a52d46a42fe8a0ed4037602565 21-Aug-2014 Jan-Willem Maarse <maarse@google.com> am a3ab4364: am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"

* commit 'a3ab4364c6bb266e8b5021913b22433d8401ec46':
7f3f30e96965e7189430e4acc53520275627264c 21-Aug-2014 Bill Yi <byi@google.com> am d0f3ba60: am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD

* commit 'd0f3ba6003b1c9430349043d7f979d600967dd2f':
7bf587289933768ada48e79cf43deecfad65c576 21-Aug-2014 Jeff Davidson <jpd@google.com> am 3656cc20: am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master

* commit '3656cc20c8a569964d0450ce3207b651c007c35c':
ee16014efd4d8a9aff0fd6efc40782ce250a1cd8 21-Aug-2014 Max Cai <maxtroy@google.com> am f613f9e7: am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"

* commit 'f613f9e7af780863acc441bd70b10e19bb61cc6e':
2b4699938126550d4e6ba7a3e0f70672c2625c20 21-Aug-2014 Max Cai <maxtroy@google.com> am 61317c32: am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"

* commit '61317c325de4a7736ea88e72ff4be4193583e1c3':
dc94687566ba7d98f65e4769d9c0e7d2f20ce895 21-Aug-2014 Wink Saville <wink@google.com> am 6eb7a519: am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""

* commit '6eb7a51929ccbbd916a0da39514a4c5877b696d5':
9160bc69c92253ddcdbe30a6737adc2bcc515c66 21-Aug-2014 Wink Saville <wink@google.com> am 390b6c4b: am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflict

* commit '390b6c4b7d6982bf2f0904fc2d44b4ebdce29e9e':
ecb2c88b22ad898c088a81870f58adbf4e16d126 21-Aug-2014 Max Cai <maxtroy@google.com> am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData."

* commit '55ef21bca9802af2a9aadd593cc606706b13f8da':
Fix access around unknownFieldData.
2e6d4ae02a955d33a75c0642b8ffead20e11fd9a 21-Aug-2014 Max Cai <maxtroy@google.com> am f39998c2: am daf63839: Merge "Keep pointers to extension values."

* commit 'f39998c2c5754ec6e2ff5ddfa529a079093b41e9':
Keep pointers to extension values.
cca3823db855ecbcad350332a274f253be7e9662 21-Aug-2014 Ying Wang <wangying@google.com> am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT

* commit '4c8e5262e3e739b850df6eac53b1a9ee7c8a4ba7':
57e2ee788511ddc26e694cc783d3e95b52f0e0d4 21-Aug-2014 Baligh Uddin <baligh@google.com> am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce

* commit 'f8b1f8314e84b8a174289c0ce492d154016fe7bd':
1f8913765270e9d90ad7384156629e116236355d 21-Aug-2014 Wink Saville <wink@google.com> am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp

* commit 'f2750dcb61de785aee6aa75b7b002dac3f1581bb':
f13aadfb6dfc707520809dbf4502e3001fd1424b 21-Aug-2014 Wink Saville <wink@google.com> am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict"

* commit 'd1439291d0a2d6558903205676d41410c319587e':
Revert "Merge commit 'e887563a' into fix-merge-conclict"
a3ab4364c6bb266e8b5021913b22433d8401ec46 21-Aug-2014 Jan-Willem Maarse <maarse@google.com> am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"

* commit '67ebd315682b27dc0d2233eabe23bd8cbb481378':
d0f3ba6003b1c9430349043d7f979d600967dd2f 21-Aug-2014 Bill Yi <byi@google.com> am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD

* commit '0e54db6b8ac292b4193a924176a939d4326e803b':
3656cc20c8a569964d0450ce3207b651c007c35c 21-Aug-2014 Jeff Davidson <jpd@google.com> am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master

* commit 'cd8a72c726b398e3bea5dfcc07c1c9c40386511d':
f613f9e7af780863acc441bd70b10e19bb61cc6e 21-Aug-2014 Max Cai <maxtroy@google.com> am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"

* commit '3af26f43dc55563842cee8604f1e802bf40a2585':
61317c325de4a7736ea88e72ff4be4193583e1c3 21-Aug-2014 Max Cai <maxtroy@google.com> am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"

* commit '90048528ee37be92be17cde8f351eb1b436cdc9e':
6eb7a51929ccbbd916a0da39514a4c5877b696d5 21-Aug-2014 Wink Saville <wink@google.com> am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""

* commit '16aad88f8a12afef0eea31709c8bc67f7c8bbdab':
390b6c4b7d6982bf2f0904fc2d44b4ebdce29e9e 21-Aug-2014 Wink Saville <wink@google.com> am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflict

* commit '291f0484a489990b7d59a78b91792fa3d935eb5c':
2239113fe7c61beeffb621aad4ad12f892493739 21-Aug-2014 Wink Saville <wink@google.com> am 75244665: am 89f0407f: am 232698c4: am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"

* commit '75244665e3b7d228b0887d0ff43a84a30c358f62':
1e7788e504dcf23d5b0d6957e4b43c390588358c 21-Aug-2014 Wink Saville <wink@google.com> am 8345e3e6: am b28d1738: am 0cb1a2f6: am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"

* commit '8345e3e6d8965a5cc2aa7a3067f3e2b1e7b032f0':
b313a8ec1b4e432d1befc233ee5461243fabd797 21-Aug-2014 Max Cai <maxtroy@google.com> am 5cba1b7d: am 339f5a6d: am 67584f49: am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."

* commit '5cba1b7dcad5909a72e940bc15a1480327d104fb':
2c831c1dec6d5e776fa9aa18f31f3dac0005aa8a 21-Aug-2014 Max Cai <maxtroy@google.com> am fc9b38a1: am 34559f88: am 1b9cb7b2: am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f

* commit 'fc9b38a1992610a6a0e3b51dad39901df293a980':
478fc8891e465107a6f1b0e92237382d860ccc3f 21-Aug-2014 Jie Dai <jied@google.com> am 4cce7ca7: am 6f45464e: am 1af058a5: am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp

* commit '4cce7ca7d4cf026a62a1fd5b37b7e028040866da':
a9aa6213f93ba157f58df454df2d32f111f46154 21-Aug-2014 Max Cai <maxtroy@google.com> am dc08aae5: am cb395443: am 5843426a: am 0c063c66: am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."

* commit 'dc08aae549f3a38bc6b1cc5a1facbbcadf4969f4':
40dc5d6caba24f532115d2873fc229b265dd322c 21-Aug-2014 Max Cai <maxtroy@google.com> am 99f1c88b: am c1d044c0: am d043ff9d: am 06396abf: am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."

* commit '99f1c88ba4039deed33328dea1e9dc38e8ca0134':
d57b0dd58c43802203d86b27c8da72461e388e88 21-Aug-2014 Max Cai <maxtroy@google.com> am 2b0e6788: am ddf77b19: am b22123d1: am e41d4c04: am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."

* commit '2b0e6788f9eab2271b28591383ed7db2309e69d4':
24c9f9394a16b0a8994450f7c70f741a762df3c3 21-Aug-2014 Andrew Flynn <flynn@google.com> am 18072b1d: am a155ce7e: am 3628a851: am 11b030c3: am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"

* commit '18072b1d0063576040575f8970d36f11a8527fbc':
9cff4c6153ac7a7210d10b16bb1b490788eb7d1a 21-Aug-2014 Max Cai <maxtroy@google.com> am 31111e30: am dad271e9: am a6ee3baf: am 843619f3: am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."

* commit '31111e302e14330c3868e6b1456dbe1e0293edef':
e201157b92d80d734f67714d386d7d96e9b4b1f2 21-Aug-2014 Max Cai <maxtroy@google.com> am 6a8d85c1: am 3a324516: am 01d1cdeb: am 175d44db: am aa721735: am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"

* commit '6a8d85c1211dd2382df6991db27872de8d990948':
18f41a1fd20220d6a3dfeab228fb7d7af051f2df 21-Aug-2014 The Android Open Source Project <initial-contribution@android.com> am f29d4247: am 8d5b7fb2: am 23b66756: am bfa5ee2f: am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD

* commit 'f29d4247c76645649c4d205abaa22eeffe1f177d':
3f8aef4eb3ed66a1db4c5f2740859bdcfecb4a59 21-Aug-2014 The Android Open Source Project <initial-contribution@android.com> am ca65c1f6: am 6d879b4e: am e747813b: am 6a76a968: am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD

* commit 'ca65c1f662624e72dc2e2da0604d869972fc73ce':
86d8e323edbe591f6a84b50f535b49f1efdbdc88 21-Aug-2014 Max Cai <maxtroy@google.com> am 93f1f6d3: am a59cc53b: am c0bffb62: am fafcc5b4: am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."

* commit '93f1f6d36883ec801a0da383550f018f1b2db7b2':
ae5cc3c915a686ff7aea0084d492912092d3103e 21-Aug-2014 Max Cai <maxtroy@google.com> am 99a4ceca: am 9b078384: am 6ca2db13: am 7630b478: am f2d09988: am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."

* commit '99a4cecac63d2ee3d414712268ef2399807d6abd':
5a61e38db359c28cecd077e5c60971c471379513 21-Aug-2014 Max Cai <maxtroy@google.com> am 58437442: am 2267616c: am 8948d605: am 4d28b813: am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."

* commit '584374426b043bee782144bd58c14f2e612f56ef':
d5556134fa65952ffd4c642b2012f737a9a311d2 21-Aug-2014 Max Cai <maxtroy@google.com> am 78d2cc9f: am 4b700b8a: am dce52afd: am fdf5bde4: am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."

* commit '78d2cc9fb3bf67926d6a2b76e76b6a32bc5d02c5':
9ecaab6656d65fb98ee00c5036c8758d37a99d17 21-Aug-2014 Max Cai <maxtroy@google.com> am ea0f327a: am 438ca4a8: am f1c5cd09: am be303d03: am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."

* commit 'ea0f327a2fa5526267963b6215abb3bbd0e766b4':
729e1bbc1c6bee4e5c76770f49f498151e188120 21-Aug-2014 Max Cai <maxtroy@google.com> am e4a89c5c: am 17395e55: am e668f0c3: am 2693b3aa: am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."

* commit 'e4a89c5c42e137fe793ed6ad26618b05188816e7':
570abcc0ccf405d65f42c8ef7bc745093a92d838 21-Aug-2014 Max Cai <maxtroy@google.com> am 405d0f3d: am 826b4cf5: am 74b536a5: am a84e8aa6: am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"

* commit '405d0f3dc1a68e94db6006fe5e92a1c9ae09928a':
2a934e9a8dd0861c3883401a982d93c632c316ce 21-Aug-2014 Max Cai <maxtroy@google.com> am f7cab2e5: am 3c4cfdab: am 80fe1808: am c45fb6a2: am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."

* commit 'f7cab2e53d8cdef0cda6762fa92c0e4828f87d51':
947bc12b9db6574e2014b70357a290e9f70eae7e 21-Aug-2014 Max Cai <maxtroy@google.com> am 42a70ce0: am 03016e74: am 2cb17b18: am b2a7fc6b: am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."

* commit '42a70ce03d0527ea9b7a1adcbfd0534f6c317c96':
c29eeea8bd50fb177958d66011229b371a527186 21-Aug-2014 Max Cai <maxtroy@google.com> am 8aad5887: am fa0eb541: am bd188bc7: am ab8cc071: am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."

* commit '8aad5887d583c502da1ef6b8ab7fe7679e8114aa':
ae0fbf1f9c587550caf27999d2ae58d6ce54293b 21-Aug-2014 Max Cai <maxtroy@google.com> am 33f1b41c: am eaac3e7b: am 4734b989: am aa2afb08: am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge

* commit '33f1b41c95115226f4168f76a5b0b5df391c81d8':
461397cba92ae89bd5e2e28885dd66eecf509743 21-Aug-2014 Max Cai <maxtroy@google.com> am 68d93707: am a61b2ef1: am e9056405: am 6ed6b682: am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."

* commit '68d93707a2112c3ab9c756146e6deddeaa837983':
35e5479d3af0a1715eb5f877f0b7d161452b6874 21-Aug-2014 Ulas Kirazci <ulas@google.com> am 4a1053a6: am 056670c9: am e655a862: am f7bbfdfd: am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"

* commit '4a1053a6edd4c2dccbeb32ff4a48f186c0d59c23':
4fbd5bcf4d4e41beeed31b7c92274fada0fd8c21 21-Aug-2014 Ulas Kirazci <ulas@google.com> am 344082e2: am 73789372: am 8d2f4cf7: am ea95349d: am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."

* commit '344082e26086119c467ced1ebf31398e64fa7f1f':
b0735eb596324fbaf216c14586aaf026858fbd58 21-Aug-2014 Wink Saville <wink@google.com> am c3e15291: am 8973d9e6: am c6ec950e: am b624b3aa: am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"

* commit 'c3e152919fda9e43fbad1ff4a62a9e2d6838e3ee':
9ed114ef09964849bc91fa28b7c2517b11675538 21-Aug-2014 Ulas Kirazci <ulas@google.com> am 2f23eb57: am d8fbc188: am b42d5107: am a6ddccbb: am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."

* commit '2f23eb57f21af3a72e963b12ce55528dde067641':
c6182b7da2e6269862ed81d46be6595eead56a77 21-Aug-2014 Ulas Kirazci <ulas@google.com> am 34ae47e2: am 8877603f: am 2b2d73d2: am a8b4f97f: am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."

* commit '34ae47e220c58578df1ca6edc9f7eed23debff55':
d4363c68a0e938ab6cc5e066b5fb2d5e4ddd7865 21-Aug-2014 Ulas Kirazci <ulas@google.com> am 62379d79: am dde8a694: am a19dbf97: am 6d1e9709: am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."

* commit '62379d790c1f33132185174dc73e8e36e032e08c':
9109c4a4703305907439e8d18243ad9a1325f2e8 21-Aug-2014 Ulas Kirazci <ulas@google.com> am b9c0728c: am 54ad71fb: am e6780389: am 998ea484: am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"

* commit 'b9c0728c4a1fedff1e9a6ab25eac3b0340b1ee10':
17b57ba0a75986ce33f22988faf2ef65bb7f38e3 21-Aug-2014 Ulas Kirazci <ulas@google.com> am 6595b4bd: am 242aa182: am 5a9d43b2: am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."

* commit '6595b4bd220dd50da9868a4364e1ce34395a9716':
ed2f1f9a3f405651e39bd43e8aeceeb184c65a9c 21-Aug-2014 Adam Metcalf <gamblore@google.com> am 0f5795bd: am cd22086d: am c0bc136b: am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the merge conflict leftovers.

* commit '0f5795bdbe62cf56c7ec8a5802ed82749d33794a':
834530034d5b38a4801e2139134dcad6a7fb9cdc 21-Aug-2014 Wink Saville <wink@google.com> am f091cdfb: am aa2e7e5f: am 3a2460f3: am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc

* commit 'f091cdfbea53190d0bd72cc0feb1da9634704268':
1bbf8255df64ce6ae7c82b746eb5c64d070dc377 21-Aug-2014 Wink Saville <wink@google.com> am 5e93722a: am ed67cd79: am d801ea90: am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit '5e93722ae156871e4c4e7df1f5f28936b68f299f':
897738118af39b142949a8d38a5836777c3da1e4 21-Aug-2014 Wink Saville <wink@google.com> am 42f3fd77: am 1c524da8: am 9f4f73e2: am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."

* commit '42f3fd77fc8468420e747cba849e959432d84ef3':
4123645a8e52eac09c21b7cfe6147031570e112c 21-Aug-2014 Wink Saville <wink@google.com> am a55aae90: am 3c00157e: am 02cba9f2: am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit 'a55aae90f695ea80b4c9d139ac41585e760528a2':
9be3d9b40ffc5619305d904fadbd2078ad8ebb48 21-Aug-2014 Wink Saville <wink@google.com> am 1978393d: am a94fe6cb: am 7a8797ab: am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."

* commit '1978393dd2773ce523f35c15007b5ad91c5f25c2':
1ba5977f3e58ec086301b751a894b93b5a39191a 21-Aug-2014 Ying Wang <wangying@google.com> am 0f36c619: am b09fd32d: am f25e1e6b: am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"

* commit '0f36c61953ea1ba726aabb4fa81cd77b43784cb1':
75244665e3b7d228b0887d0ff43a84a30c358f62 21-Aug-2014 Wink Saville <wink@google.com> am 89f0407f: am 232698c4: am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"

* commit '89f0407f57f9127ab8d1040a06af741173faece2':
8345e3e6d8965a5cc2aa7a3067f3e2b1e7b032f0 21-Aug-2014 Wink Saville <wink@google.com> am b28d1738: am 0cb1a2f6: am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"

* commit 'b28d17386a434ee49e48d958823141036ed8c127':
5cba1b7dcad5909a72e940bc15a1480327d104fb 21-Aug-2014 Max Cai <maxtroy@google.com> am 339f5a6d: am 67584f49: am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."

* commit '339f5a6db8053b4095af6454250e246ffeb8b295':
fc9b38a1992610a6a0e3b51dad39901df293a980 21-Aug-2014 Max Cai <maxtroy@google.com> am 34559f88: am 1b9cb7b2: am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f

* commit '34559f88be5c2071a9be321ed01725b364cdf29d':
4cce7ca7d4cf026a62a1fd5b37b7e028040866da 21-Aug-2014 Jie Dai <jied@google.com> am 6f45464e: am 1af058a5: am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp

* commit '6f45464eb45eba2846ee9e96aaecd81fef4662ef':
dc08aae549f3a38bc6b1cc5a1facbbcadf4969f4 21-Aug-2014 Max Cai <maxtroy@google.com> am cb395443: am 5843426a: am 0c063c66: am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."

* commit 'cb395443fb9a2066dba2a5c0f71aaf088fd0ad1c':
99f1c88ba4039deed33328dea1e9dc38e8ca0134 21-Aug-2014 Max Cai <maxtroy@google.com> am c1d044c0: am d043ff9d: am 06396abf: am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."

* commit 'c1d044c0b1b97265e3bef096acdaa503d9ec615a':
2b0e6788f9eab2271b28591383ed7db2309e69d4 21-Aug-2014 Max Cai <maxtroy@google.com> am ddf77b19: am b22123d1: am e41d4c04: am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."

* commit 'ddf77b1914d3f2b0bd1310cedc41713fe7d2fbe4':
18072b1d0063576040575f8970d36f11a8527fbc 21-Aug-2014 Andrew Flynn <flynn@google.com> am a155ce7e: am 3628a851: am 11b030c3: am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"

* commit 'a155ce7ea537b9388e0785d74363f3e11177a5e0':
31111e302e14330c3868e6b1456dbe1e0293edef 21-Aug-2014 Max Cai <maxtroy@google.com> am dad271e9: am a6ee3baf: am 843619f3: am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."

* commit 'dad271e9a19fe98c4dd987ee5398b316309ace3e':
6a8d85c1211dd2382df6991db27872de8d990948 21-Aug-2014 Max Cai <maxtroy@google.com> am 3a324516: am 01d1cdeb: am 175d44db: am aa721735: am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"

* commit '3a324516bd8757996725ac3c28224bc41d5123be':
f29d4247c76645649c4d205abaa22eeffe1f177d 21-Aug-2014 The Android Open Source Project <initial-contribution@android.com> am 8d5b7fb2: am 23b66756: am bfa5ee2f: am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD

* commit '8d5b7fb23a951dabb95bce445ef588b68e6b0e63':
ca65c1f662624e72dc2e2da0604d869972fc73ce 21-Aug-2014 The Android Open Source Project <initial-contribution@android.com> am 6d879b4e: am e747813b: am 6a76a968: am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD

* commit '6d879b4e0d411dd925978437c43e052cf3fba00e':
93f1f6d36883ec801a0da383550f018f1b2db7b2 21-Aug-2014 Max Cai <maxtroy@google.com> am a59cc53b: am c0bffb62: am fafcc5b4: am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."

* commit 'a59cc53b9271c09380769f86846583a94349f390':
99a4cecac63d2ee3d414712268ef2399807d6abd 21-Aug-2014 Max Cai <maxtroy@google.com> am 9b078384: am 6ca2db13: am 7630b478: am f2d09988: am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."

* commit '9b07838482cc1c03bf486ea9b5f465d329bb07df':
584374426b043bee782144bd58c14f2e612f56ef 21-Aug-2014 Max Cai <maxtroy@google.com> am 2267616c: am 8948d605: am 4d28b813: am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."

* commit '2267616c6621b748c8551c9895e47a792ee04cb2':
78d2cc9fb3bf67926d6a2b76e76b6a32bc5d02c5 21-Aug-2014 Max Cai <maxtroy@google.com> am 4b700b8a: am dce52afd: am fdf5bde4: am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."

* commit '4b700b8a8b6ed8151aa22b99b2e0dac214e251f3':
ea0f327a2fa5526267963b6215abb3bbd0e766b4 21-Aug-2014 Max Cai <maxtroy@google.com> am 438ca4a8: am f1c5cd09: am be303d03: am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."

* commit '438ca4a840876afd43ac8cbea4df2130c0629072':
e4a89c5c42e137fe793ed6ad26618b05188816e7 21-Aug-2014 Max Cai <maxtroy@google.com> am 17395e55: am e668f0c3: am 2693b3aa: am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."

* commit '17395e556af77b06ea3de454d5c279802ec8cc49':
405d0f3dc1a68e94db6006fe5e92a1c9ae09928a 21-Aug-2014 Max Cai <maxtroy@google.com> am 826b4cf5: am 74b536a5: am a84e8aa6: am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"

* commit '826b4cf541f3d21f374e2749c48348c6539c6b2e':
f7cab2e53d8cdef0cda6762fa92c0e4828f87d51 21-Aug-2014 Max Cai <maxtroy@google.com> am 3c4cfdab: am 80fe1808: am c45fb6a2: am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."

* commit '3c4cfdab8ef45fd94de3acb4f95dd35defa58a41':
42a70ce03d0527ea9b7a1adcbfd0534f6c317c96 21-Aug-2014 Max Cai <maxtroy@google.com> am 03016e74: am 2cb17b18: am b2a7fc6b: am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."

* commit '03016e747254a97144db2703106787b493fb5014':
8aad5887d583c502da1ef6b8ab7fe7679e8114aa 21-Aug-2014 Max Cai <maxtroy@google.com> am fa0eb541: am bd188bc7: am ab8cc071: am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."

* commit 'fa0eb541ce7abf79b1bf7ba5526d3418d74657ab':
33f1b41c95115226f4168f76a5b0b5df391c81d8 21-Aug-2014 Max Cai <maxtroy@google.com> am eaac3e7b: am 4734b989: am aa2afb08: am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge

* commit 'eaac3e7b84356fe00296604faf75cbcaba57e6a0':
68d93707a2112c3ab9c756146e6deddeaa837983 21-Aug-2014 Max Cai <maxtroy@google.com> am a61b2ef1: am e9056405: am 6ed6b682: am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."

* commit 'a61b2ef1d7b372b858b6aae07cf3eebbf62184b8':
4a1053a6edd4c2dccbeb32ff4a48f186c0d59c23 21-Aug-2014 Ulas Kirazci <ulas@google.com> am 056670c9: am e655a862: am f7bbfdfd: am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"

* commit '056670c92d2a1420accbb07e636b895d925df2a1':
344082e26086119c467ced1ebf31398e64fa7f1f 21-Aug-2014 Ulas Kirazci <ulas@google.com> am 73789372: am 8d2f4cf7: am ea95349d: am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."

* commit '73789372578a45ceae125e2f66254988ac7eed73':
c3e152919fda9e43fbad1ff4a62a9e2d6838e3ee 21-Aug-2014 Wink Saville <wink@google.com> am 8973d9e6: am c6ec950e: am b624b3aa: am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"

* commit '8973d9e63f9f972d646b07719d9292752e3aa382':
2f23eb57f21af3a72e963b12ce55528dde067641 21-Aug-2014 Ulas Kirazci <ulas@google.com> am d8fbc188: am b42d5107: am a6ddccbb: am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."

* commit 'd8fbc18826e4945c45b22b5d36d5e07deb08bf0a':
34ae47e220c58578df1ca6edc9f7eed23debff55 21-Aug-2014 Ulas Kirazci <ulas@google.com> am 8877603f: am 2b2d73d2: am a8b4f97f: am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."

* commit '8877603f0c61a959ef667df563429589f3a71cc0':
62379d790c1f33132185174dc73e8e36e032e08c 21-Aug-2014 Ulas Kirazci <ulas@google.com> am dde8a694: am a19dbf97: am 6d1e9709: am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."

* commit 'dde8a694bae836c024acd5dbed7690a3d2f5ee38':
b9c0728c4a1fedff1e9a6ab25eac3b0340b1ee10 21-Aug-2014 Ulas Kirazci <ulas@google.com> am 54ad71fb: am e6780389: am 998ea484: am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"

* commit '54ad71fb613edb446a3f28de79e1e0d11b345fc5':
6595b4bd220dd50da9868a4364e1ce34395a9716 21-Aug-2014 Ulas Kirazci <ulas@google.com> am 242aa182: am 5a9d43b2: am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."

* commit '242aa182dd320e27e551e1a0f5a1aeafb3f73fb5':
0f5795bdbe62cf56c7ec8a5802ed82749d33794a 21-Aug-2014 Adam Metcalf <gamblore@google.com> am cd22086d: am c0bc136b: am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the merge conflict leftovers.

* commit 'cd22086de194f7d8b94b47627c4c4f3fecfee95c':
f091cdfbea53190d0bd72cc0feb1da9634704268 21-Aug-2014 Wink Saville <wink@google.com> am aa2e7e5f: am 3a2460f3: am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc

* commit 'aa2e7e5fb6358b70d17b5dfe145cef61db1888ce':
5e93722ae156871e4c4e7df1f5f28936b68f299f 21-Aug-2014 Wink Saville <wink@google.com> am ed67cd79: am d801ea90: am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit 'ed67cd79c6deb58ba287a45753b076bed3a817c5':
42f3fd77fc8468420e747cba849e959432d84ef3 21-Aug-2014 Wink Saville <wink@google.com> am 1c524da8: am 9f4f73e2: am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."

* commit '1c524da854c2351a5fc92f77fa4f63980ba5b4c7':
a55aae90f695ea80b4c9d139ac41585e760528a2 21-Aug-2014 Wink Saville <wink@google.com> am 3c00157e: am 02cba9f2: am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit '3c00157ec8e7d64e1a23c4b3a48edfcf28e3f70d':
1978393dd2773ce523f35c15007b5ad91c5f25c2 21-Aug-2014 Wink Saville <wink@google.com> am a94fe6cb: am 7a8797ab: am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."

* commit 'a94fe6cb54165b8139b719f287cdad4973f93643':
0f36c61953ea1ba726aabb4fa81cd77b43784cb1 21-Aug-2014 Ying Wang <wangying@google.com> am b09fd32d: am f25e1e6b: am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"

* commit 'b09fd32de981b889f973de772a696cef47162ebf':
89f0407f57f9127ab8d1040a06af741173faece2 20-Aug-2014 Wink Saville <wink@google.com> am 232698c4: am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"

* commit '232698c44c5d0fec83030adcc4c2048964f2dc66':
b28d17386a434ee49e48d958823141036ed8c127 20-Aug-2014 Wink Saville <wink@google.com> am 0cb1a2f6: am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"

* commit '0cb1a2f69a2a2099b3af052eaa2e573e59263b63':
339f5a6db8053b4095af6454250e246ffeb8b295 20-Aug-2014 Max Cai <maxtroy@google.com> am 67584f49: am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."

* commit '67584f49159c3f677abb15c2c58a9c75bca5da2f':
34559f88be5c2071a9be321ed01725b364cdf29d 20-Aug-2014 Max Cai <maxtroy@google.com> am 1b9cb7b2: am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f

* commit '1b9cb7b25f9f7fd02fd0b69bd3acf266e3b28a4d':
6f45464eb45eba2846ee9e96aaecd81fef4662ef 20-Aug-2014 Jie Dai <jied@google.com> am 1af058a5: am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp

* commit '1af058a52b92a90c7d215f8627a7366cfe1185cf':
cb395443fb9a2066dba2a5c0f71aaf088fd0ad1c 20-Aug-2014 Max Cai <maxtroy@google.com> am 5843426a: am 0c063c66: am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."

* commit '5843426abfdb490874f9d523dac04a825580c7af':
c1d044c0b1b97265e3bef096acdaa503d9ec615a 20-Aug-2014 Max Cai <maxtroy@google.com> am d043ff9d: am 06396abf: am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."

* commit 'd043ff9d86baa219256036053f09dc5190f38f63':
ddf77b1914d3f2b0bd1310cedc41713fe7d2fbe4 20-Aug-2014 Max Cai <maxtroy@google.com> am b22123d1: am e41d4c04: am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."

* commit 'b22123d1d9331a35fa6a5b081acf04db090cc9b4':
a155ce7ea537b9388e0785d74363f3e11177a5e0 20-Aug-2014 Andrew Flynn <flynn@google.com> am 3628a851: am 11b030c3: am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"

* commit '3628a851ca99c7b2058702aad9bb97f408513e56':
dad271e9a19fe98c4dd987ee5398b316309ace3e 20-Aug-2014 Max Cai <maxtroy@google.com> am a6ee3baf: am 843619f3: am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."

* commit 'a6ee3baf90c1ba2ed2cf5f00ce7a75ec9946d93b':
3a324516bd8757996725ac3c28224bc41d5123be 20-Aug-2014 Max Cai <maxtroy@google.com> am 01d1cdeb: am 175d44db: am aa721735: am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"

* commit '01d1cdebf2de82c31ccd98909530213c489809a7':
8d5b7fb23a951dabb95bce445ef588b68e6b0e63 20-Aug-2014 The Android Open Source Project <initial-contribution@android.com> am 23b66756: am bfa5ee2f: am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD

* commit '23b66756ffe59505358b83f93ebe5880eb1be702':
6d879b4e0d411dd925978437c43e052cf3fba00e 20-Aug-2014 The Android Open Source Project <initial-contribution@android.com> am e747813b: am 6a76a968: am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD

* commit 'e747813b29262b01b7f5417286d18d5b0040a1cc':
a59cc53b9271c09380769f86846583a94349f390 20-Aug-2014 Max Cai <maxtroy@google.com> am c0bffb62: am fafcc5b4: am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."

* commit 'c0bffb629f7dc431c6d458956e615d13231edcfa':
9b07838482cc1c03bf486ea9b5f465d329bb07df 20-Aug-2014 Max Cai <maxtroy@google.com> am 6ca2db13: am 7630b478: am f2d09988: am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."

* commit '6ca2db13d632e79b7ddde073f5693cf648ee8ee0':
2267616c6621b748c8551c9895e47a792ee04cb2 20-Aug-2014 Max Cai <maxtroy@google.com> am 8948d605: am 4d28b813: am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."

* commit '8948d605872d310771d1e9e73669778660a6b787':
4b700b8a8b6ed8151aa22b99b2e0dac214e251f3 20-Aug-2014 Max Cai <maxtroy@google.com> am dce52afd: am fdf5bde4: am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."

* commit 'dce52afd8eb043950cbfac7e057362918159b07f':
438ca4a840876afd43ac8cbea4df2130c0629072 20-Aug-2014 Max Cai <maxtroy@google.com> am f1c5cd09: am be303d03: am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."

* commit 'f1c5cd09595cd305a25713cc85e1f79a0711bf40':
17395e556af77b06ea3de454d5c279802ec8cc49 20-Aug-2014 Max Cai <maxtroy@google.com> am e668f0c3: am 2693b3aa: am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."

* commit 'e668f0c3a996574010b60daa74823bfa9429dcda':
826b4cf541f3d21f374e2749c48348c6539c6b2e 20-Aug-2014 Max Cai <maxtroy@google.com> am 74b536a5: am a84e8aa6: am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"

* commit '74b536a558743acacb10e00aced05e59249a76bc':
3c4cfdab8ef45fd94de3acb4f95dd35defa58a41 20-Aug-2014 Max Cai <maxtroy@google.com> am 80fe1808: am c45fb6a2: am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."

* commit '80fe180823978fc40c77e035dbbaea8d1a641ea1':
03016e747254a97144db2703106787b493fb5014 20-Aug-2014 Max Cai <maxtroy@google.com> am 2cb17b18: am b2a7fc6b: am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."

* commit '2cb17b1847eb7d6d0d1180bc0f16fca0255987d2':
fa0eb541ce7abf79b1bf7ba5526d3418d74657ab 20-Aug-2014 Max Cai <maxtroy@google.com> am bd188bc7: am ab8cc071: am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."

* commit 'bd188bc73c8d0f6214192b66780764cf4315530e':
eaac3e7b84356fe00296604faf75cbcaba57e6a0 20-Aug-2014 Max Cai <maxtroy@google.com> am 4734b989: am aa2afb08: am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge

* commit '4734b9898c715a060e3d4f56ddf79be9fc6f2d1e':
a61b2ef1d7b372b858b6aae07cf3eebbf62184b8 20-Aug-2014 Max Cai <maxtroy@google.com> am e9056405: am 6ed6b682: am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."

* commit 'e90564050f017e6e5d78ed5328c21a2b445e1122':
056670c92d2a1420accbb07e636b895d925df2a1 20-Aug-2014 Ulas Kirazci <ulas@google.com> am e655a862: am f7bbfdfd: am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"

* commit 'e655a86220da5f0e3a5135a0cf82ac4e114a2466':
73789372578a45ceae125e2f66254988ac7eed73 20-Aug-2014 Ulas Kirazci <ulas@google.com> am 8d2f4cf7: am ea95349d: am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."

* commit '8d2f4cf7214e1c6c2df85212cfbbd8859e04203a':
8973d9e63f9f972d646b07719d9292752e3aa382 20-Aug-2014 Wink Saville <wink@google.com> am c6ec950e: am b624b3aa: am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"

* commit 'c6ec950e9cc24aed39c2e6ba70b2760407b9d186':
d8fbc18826e4945c45b22b5d36d5e07deb08bf0a 20-Aug-2014 Ulas Kirazci <ulas@google.com> am b42d5107: am a6ddccbb: am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."

* commit 'b42d51071f44afef6c4ca5afe1c76501a5b057c7':
8877603f0c61a959ef667df563429589f3a71cc0 20-Aug-2014 Ulas Kirazci <ulas@google.com> am 2b2d73d2: am a8b4f97f: am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."

* commit '2b2d73d26843cf178a1f23f30472934060194519':
dde8a694bae836c024acd5dbed7690a3d2f5ee38 20-Aug-2014 Ulas Kirazci <ulas@google.com> am a19dbf97: am 6d1e9709: am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."

* commit 'a19dbf97df8416851dda1e01c5b27642d04e257a':
54ad71fb613edb446a3f28de79e1e0d11b345fc5 20-Aug-2014 Ulas Kirazci <ulas@google.com> am e6780389: am 998ea484: am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"

* commit 'e6780389313c3269c725a4f245bba4513ec6879c':
242aa182dd320e27e551e1a0f5a1aeafb3f73fb5 20-Aug-2014 Ulas Kirazci <ulas@google.com> am 5a9d43b2: am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."

* commit '5a9d43b211ede37422ca16feb06fa6f04a450f18':
cd22086de194f7d8b94b47627c4c4f3fecfee95c 20-Aug-2014 Adam Metcalf <gamblore@google.com> am c0bc136b: am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the merge conflict leftovers.

* commit 'c0bc136bb738812862d45b53f8546200741d558b':
aa2e7e5fb6358b70d17b5dfe145cef61db1888ce 20-Aug-2014 Wink Saville <wink@google.com> am 3a2460f3: am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc

* commit '3a2460f3dda97d12e4f592d727549fe7b1214b40':
ed67cd79c6deb58ba287a45753b076bed3a817c5 20-Aug-2014 Wink Saville <wink@google.com> am d801ea90: am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit 'd801ea90d87ceb1aa4d2cf591885c3d2c885d1d8':
1c524da854c2351a5fc92f77fa4f63980ba5b4c7 20-Aug-2014 Wink Saville <wink@google.com> am 9f4f73e2: am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."

* commit '9f4f73e2ef3cfad4f364d6b4a3d11e6eca6aa172':
3c00157ec8e7d64e1a23c4b3a48edfcf28e3f70d 20-Aug-2014 Wink Saville <wink@google.com> am 02cba9f2: am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit '02cba9f2f4aeaf5f0f004d030c7bf379aeaecd79':
a94fe6cb54165b8139b719f287cdad4973f93643 20-Aug-2014 Wink Saville <wink@google.com> am 7a8797ab: am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."

* commit '7a8797abb1f80e93522b0a7c7acd177afb3ba0a4':
b09fd32de981b889f973de772a696cef47162ebf 20-Aug-2014 Ying Wang <wangying@google.com> am f25e1e6b: am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"

* commit 'f25e1e6bb77d583855d68c72a3bfd237a12178ab':
232698c44c5d0fec83030adcc4c2048964f2dc66 20-Aug-2014 Wink Saville <wink@google.com> am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"

* commit 'de6420aa3fef9f6f85e88fd8e0c7667230d81753':
0cb1a2f69a2a2099b3af052eaa2e573e59263b63 20-Aug-2014 Wink Saville <wink@google.com> am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"

* commit 'c8f69926325e0653ba4244dbd041c2d29b784194':
67584f49159c3f677abb15c2c58a9c75bca5da2f 20-Aug-2014 Max Cai <maxtroy@google.com> am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."

* commit '9de5297388d67b5ddefdb3cf4e1f13a50f0a9c10':
1b9cb7b25f9f7fd02fd0b69bd3acf266e3b28a4d 20-Aug-2014 Max Cai <maxtroy@google.com> am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f

* commit '0eaea6a8d71e3b323f2fe3bccb3829162c04e33c':
1af058a52b92a90c7d215f8627a7366cfe1185cf 20-Aug-2014 Jie Dai <jied@google.com> am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp

* commit '0ce2c26133762a55c52c0262bbe393370b806276':
5843426abfdb490874f9d523dac04a825580c7af 20-Aug-2014 Max Cai <maxtroy@google.com> am 0c063c66: am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."

* commit '0c063c66604c5dee434534ff775eb6d18ce4ed7b':
d043ff9d86baa219256036053f09dc5190f38f63 20-Aug-2014 Max Cai <maxtroy@google.com> am 06396abf: am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."

* commit '06396abfe648b84e4c17d0e4a98a6cd34d57aaab':
b22123d1d9331a35fa6a5b081acf04db090cc9b4 20-Aug-2014 Max Cai <maxtroy@google.com> am e41d4c04: am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."

* commit 'e41d4c041cb2c6d58c4508cf792cd4e987991b2a':
3628a851ca99c7b2058702aad9bb97f408513e56 20-Aug-2014 Andrew Flynn <flynn@google.com> am 11b030c3: am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"

* commit '11b030c32e2b740283ddd455e1e29748667cf314':
a6ee3baf90c1ba2ed2cf5f00ce7a75ec9946d93b 20-Aug-2014 Max Cai <maxtroy@google.com> am 843619f3: am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."

* commit '843619f3a85440e94d1cbec0f71173eb560d6d73':
01d1cdebf2de82c31ccd98909530213c489809a7 20-Aug-2014 Max Cai <maxtroy@google.com> am 175d44db: am aa721735: am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"

* commit '175d44dbf967c326956f5ee11cfe72cbd571601c':
23b66756ffe59505358b83f93ebe5880eb1be702 20-Aug-2014 The Android Open Source Project <initial-contribution@android.com> am bfa5ee2f: am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD

* commit 'bfa5ee2ff6bde25e15bcf855f60208c01bf7fd5e':
e747813b29262b01b7f5417286d18d5b0040a1cc 20-Aug-2014 The Android Open Source Project <initial-contribution@android.com> am 6a76a968: am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD

* commit '6a76a968d2c5c22a313dd2646d1b2941d17ff89d':
c0bffb629f7dc431c6d458956e615d13231edcfa 20-Aug-2014 Max Cai <maxtroy@google.com> am fafcc5b4: am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."

* commit 'fafcc5b4f42837ab05c9cf1f390e7e4a6b370f2e':
6ca2db13d632e79b7ddde073f5693cf648ee8ee0 20-Aug-2014 Max Cai <maxtroy@google.com> am 7630b478: am f2d09988: am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."

* commit '7630b4785d2675d37a272dc274318bd5a77c3805':
8948d605872d310771d1e9e73669778660a6b787 20-Aug-2014 Max Cai <maxtroy@google.com> am 4d28b813: am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."

* commit '4d28b813b64ccc215cd462de7f33455abbe04d0b':
dce52afd8eb043950cbfac7e057362918159b07f 20-Aug-2014 Max Cai <maxtroy@google.com> am fdf5bde4: am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."

* commit 'fdf5bde4157bb3e5a5dc36d4acda930fd74933f1':
f1c5cd09595cd305a25713cc85e1f79a0711bf40 20-Aug-2014 Max Cai <maxtroy@google.com> am be303d03: am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."

* commit 'be303d0372ccf9e2fbc0abf238b925142ba0a8bf':
e668f0c3a996574010b60daa74823bfa9429dcda 20-Aug-2014 Max Cai <maxtroy@google.com> am 2693b3aa: am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."

* commit '2693b3aadbddaa28c4f9b4f3f11236b986f15557':
74b536a558743acacb10e00aced05e59249a76bc 20-Aug-2014 Max Cai <maxtroy@google.com> am a84e8aa6: am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"

* commit 'a84e8aa6cd9b98e52d70d93ab10cbdf9c48c5a26':
80fe180823978fc40c77e035dbbaea8d1a641ea1 20-Aug-2014 Max Cai <maxtroy@google.com> am c45fb6a2: am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."

* commit 'c45fb6a2338edd7c900fcd3612da79ec9d0a43e5':
2cb17b1847eb7d6d0d1180bc0f16fca0255987d2 20-Aug-2014 Max Cai <maxtroy@google.com> am b2a7fc6b: am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."

* commit 'b2a7fc6b0585f3c53ea8110a8740141847f3394e':
bd188bc73c8d0f6214192b66780764cf4315530e 20-Aug-2014 Max Cai <maxtroy@google.com> am ab8cc071: am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."

* commit 'ab8cc07120d0fbb6ea4982459bc4238f0eea61bd':
4734b9898c715a060e3d4f56ddf79be9fc6f2d1e 20-Aug-2014 Max Cai <maxtroy@google.com> am aa2afb08: am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge

* commit 'aa2afb0865fa9c15dcaf657d13c5144186548320':
e90564050f017e6e5d78ed5328c21a2b445e1122 20-Aug-2014 Max Cai <maxtroy@google.com> am 6ed6b682: am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."

* commit '6ed6b682a2b93135e3f5cffc7e7627b879354c82':
e655a86220da5f0e3a5135a0cf82ac4e114a2466 20-Aug-2014 Ulas Kirazci <ulas@google.com> am f7bbfdfd: am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"

* commit 'f7bbfdfd53b1fbe0073eaa2b132d358edae2b545':
8d2f4cf7214e1c6c2df85212cfbbd8859e04203a 20-Aug-2014 Ulas Kirazci <ulas@google.com> am ea95349d: am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."

* commit 'ea95349d36ad1894fd68b23b04bc9a6422adeeb0':
c6ec950e9cc24aed39c2e6ba70b2760407b9d186 20-Aug-2014 Wink Saville <wink@google.com> am b624b3aa: am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"

* commit 'b624b3aa455ecf71c44bde4cf7488e7c199a0b8a':
b42d51071f44afef6c4ca5afe1c76501a5b057c7 20-Aug-2014 Ulas Kirazci <ulas@google.com> am a6ddccbb: am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."

* commit 'a6ddccbbac403dbe6fce5623768755c08d41c962':
2b2d73d26843cf178a1f23f30472934060194519 20-Aug-2014 Ulas Kirazci <ulas@google.com> am a8b4f97f: am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."

* commit 'a8b4f97f34c7505fb1d1bc87ebe4c83f7032454c':
a19dbf97df8416851dda1e01c5b27642d04e257a 20-Aug-2014 Ulas Kirazci <ulas@google.com> am 6d1e9709: am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."

* commit '6d1e97097eca8f50e629c10fcabbffbe064868b8':
e6780389313c3269c725a4f245bba4513ec6879c 20-Aug-2014 Ulas Kirazci <ulas@google.com> am 998ea484: am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"

* commit '998ea484ba19563fd32ba3e2e16e785f449afa74':
5a9d43b211ede37422ca16feb06fa6f04a450f18 20-Aug-2014 Ulas Kirazci <ulas@google.com> am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."

* commit 'ede9a1f51eeff78ee4776858a17bda2d94e3edc5':
c0bc136bb738812862d45b53f8546200741d558b 20-Aug-2014 Adam Metcalf <gamblore@google.com> am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the merge conflict leftovers.

* commit '67f3f6aa6d6b43d596ab5a572c6ae34fb60a8066':
3a2460f3dda97d12e4f592d727549fe7b1214b40 20-Aug-2014 Wink Saville <wink@google.com> am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc

* commit 'f3bf05831fdad617a7841d7943a9f6f5797582a8':
d801ea90d87ceb1aa4d2cf591885c3d2c885d1d8 20-Aug-2014 Wink Saville <wink@google.com> am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit '2fb1789c06fa82f73d136d83189ad1a54043348d':
9f4f73e2ef3cfad4f364d6b4a3d11e6eca6aa172 20-Aug-2014 Wink Saville <wink@google.com> am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."

* commit '50ddd7addefb02ca23efd2f2c60442f91e276792':
02cba9f2f4aeaf5f0f004d030c7bf379aeaecd79 20-Aug-2014 Wink Saville <wink@google.com> am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit '05f45faa5951f5ae0d05e0a4a9f5249339df31b4':
7a8797abb1f80e93522b0a7c7acd177afb3ba0a4 20-Aug-2014 Wink Saville <wink@google.com> am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."

* commit '77140fb2a041eec2ef96cff59f8fa81c9355fcf3':
f25e1e6bb77d583855d68c72a3bfd237a12178ab 20-Aug-2014 Ying Wang <wangying@google.com> am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"

* commit '165d4d7e343099e4b84137b852a0a2070c27bba4':
bc6288c686a78ee2aea489a80a2d66fbe4b95748 13-Aug-2014 Alex Cheung <alexcheung@google.com> Initial empty repository
d0ef5cdd980e6845eb560aae0f1cf3ef9b0d8cb3 07-Aug-2014 Max Cai <maxtroy@google.com> am 682363bc: am a76831c3: Merge "Fix how getRepeatedFieldArrayLength works"

* commit '682363bcf6addd6cdb822bc0fed5cd724ffe957d':
Fix how getRepeatedFieldArrayLength works
682363bcf6addd6cdb822bc0fed5cd724ffe957d 07-Aug-2014 Max Cai <maxtroy@google.com> am a76831c3: Merge "Fix how getRepeatedFieldArrayLength works"

* commit 'a76831c3629c3c1a9900984f3aea6306dbf0734c':
Fix how getRepeatedFieldArrayLength works
3a6a7db0217aa665fecd8a23d3819d5a41ed2000 06-Aug-2014 Sam Hasinoff <hasinoff@google.com> am d3518087: am f91b7fa1: Fix build, by using external/zlib instead of system zlib

* commit 'd35180871e469a79f0bec638693864f037ba4f2f':
Fix build, by using external/zlib instead of system zlib
d35180871e469a79f0bec638693864f037ba4f2f 05-Aug-2014 Sam Hasinoff <hasinoff@google.com> am f91b7fa1: Fix build, by using external/zlib instead of system zlib

* commit 'f91b7fa173d2aa76ce593c20e429bd8d480599ea':
Fix build, by using external/zlib instead of system zlib
f91b7fa173d2aa76ce593c20e429bd8d480599ea 05-Aug-2014 Sam Hasinoff <hasinoff@google.com> Fix build, by using external/zlib instead of system zlib

Change-Id: I22f72f7c21f0c3f7b40deeca429af39453dfdc51
ndroid.mk
a76831c3629c3c1a9900984f3aea6306dbf0734c 07-Aug-2014 Max Cai <maxtroy@google.com> Merge "Fix how getRepeatedFieldArrayLength works"
e422917306336275981f5cbcd1ee055b10a0bd3c 31-Jul-2014 Leandro Gracia Gil <leandrogracia@google.com> am 3c1dbbae: am 4d11e705: Merge "Fix the aprotoc target for Windows."

* commit '3c1dbbae095cd8f4c354cf24e27c615c8e160bdc':
Fix the aprotoc target for Windows.
3c1dbbae095cd8f4c354cf24e27c615c8e160bdc 31-Jul-2014 Leandro Gracia Gil <leandrogracia@google.com> am 4d11e705: Merge "Fix the aprotoc target for Windows."

* commit '4d11e705cb073e55283452e6fd50e3feff54f82c':
Fix the aprotoc target for Windows.
4d11e705cb073e55283452e6fd50e3feff54f82c 31-Jul-2014 Leandro Gracia Gil <leandrogracia@google.com> Merge "Fix the aprotoc target for Windows."
bcbea78e367523e5cbb257c25c03a31b1250c7ba 29-Jul-2014 Leandro Gracia Gil <leandrogracia@google.com> Fix the aprotoc target for Windows.

Allows aprotoc.exe to be cross-compiled when building the Windows SDK.

Change-Id: I7e1eec945b5578e1fe6c368b128fe1f9396f491c
ndroid.mk
rc/google/protobuf/compiler/subprocess.h
f883f255a35ffa5fad7a2c0908b7cca80d83ec6d 22-Jul-2014 Brian Duff <bduff@google.com> am f9b409e3: am 95d99df4: Merge "Don\'t return NULL from {Boxed}PrimitiveTypeName."

* commit 'f9b409e35963a357985ee687d096f8c166e0b80e':
Don't return NULL from {Boxed}PrimitiveTypeName.
f9b409e35963a357985ee687d096f8c166e0b80e 22-Jul-2014 Brian Duff <bduff@google.com> am 95d99df4: Merge "Don\'t return NULL from {Boxed}PrimitiveTypeName."

* commit '95d99df4574c28debcf9646056a0350ff44bc7c9':
Don't return NULL from {Boxed}PrimitiveTypeName.
95d99df4574c28debcf9646056a0350ff44bc7c9 22-Jul-2014 Brian Duff <bduff@google.com> Merge "Don't return NULL from {Boxed}PrimitiveTypeName."
ba13794999073dd15f7e3ed3bfb87ddac477e19b 21-Jul-2014 Brian Duff <bduff@google.com> Don't return NULL from {Boxed}PrimitiveTypeName.

The behavior of the string ctor is undefined when you pass NULL. This
is checked strictly in C++11, so fails to compile.

Change-Id: Id5e0984ad1d37f2d504f7c42ac23e52ed4a58903
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
c1cc7880c9dcbf4b1c7dc73031e564ac835a61fd 18-Jul-2014 Max Cai <maxtroy@google.com> am 60b72a8e: am 11607eb1: Merge "Add a hasExtension method to ExtendableMessageNano."

* commit '60b72a8ef366b27110e8a70caacb2fcd97e1ce92':
Add a hasExtension method to ExtendableMessageNano.
60b72a8ef366b27110e8a70caacb2fcd97e1ce92 18-Jul-2014 Max Cai <maxtroy@google.com> am 11607eb1: Merge "Add a hasExtension method to ExtendableMessageNano."

* commit '11607eb10bcf3a46e92257966949d48b28bb7bf3':
Add a hasExtension method to ExtendableMessageNano.
11607eb10bcf3a46e92257966949d48b28bb7bf3 18-Jul-2014 Max Cai <maxtroy@google.com> Merge "Add a hasExtension method to ExtendableMessageNano."
0f67b212cd169ccf83221273ed88504d7e3f8165 17-Jul-2014 Juan Silveira <jjso@google.com> Add a hasExtension method to ExtendableMessageNano.

It allows checking for the presence of an extension without having to
deserialize the field.

Change-Id: Id542d20274b2435b7bc2b322740e9984cb8639a1
ava/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
73d4c421ff5a21f492ad90d91b98061938843521 15-Jul-2014 Harsh Modi <harshmodi@google.com> Add a 'lite' configuration for building protobuf

Change-Id: I9b34720c761d75f42ce2f033fe22abeabefdae90
uild.gradle
55ef21bca9802af2a9aadd593cc606706b13f8da 15-Jul-2014 Max Cai <maxtroy@google.com> am a88808d4: Merge "Fix access around unknownFieldData."

* commit 'a88808d414308b5b567d3afaab56fc338ad80667':
Fix access around unknownFieldData.
f39998c2c5754ec6e2ff5ddfa529a079093b41e9 15-Jul-2014 Max Cai <maxtroy@google.com> am daf63839: Merge "Keep pointers to extension values."

* commit 'daf638399bd42122306786e8062f392ddace4363':
Keep pointers to extension values.
daf638399bd42122306786e8062f392ddace4363 15-Jul-2014 Max Cai <maxtroy@google.com> Merge "Keep pointers to extension values."
a88808d414308b5b567d3afaab56fc338ad80667 15-Jul-2014 Max Cai <maxtroy@google.com> Merge "Fix access around unknownFieldData."
11f883e185a2ea6fd6d0b19520e9f0f004e90e5c 15-Jul-2014 Max Cai <maxtroy@google.com> Fix access around unknownFieldData.

Instead of publishing its class I chose to encapsulate the troublesome
references in equals()/hashCode() in the generated code into superclass
methods in ExtendableMessageNano.

Changed a couple of java packages in the test suite to catch this issue
easier in the future.

Change-Id: I43f88411f63bb6f3ffc8d63361f2f77bebf6220a
ava/pom.xml
ava/src/device/test/java/com/google/protobuf/nano/NanoAndroidTest.java
ava/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/unittest_extension_nano.proto
rc/google/protobuf/unittest_import_nano.proto
cf1b416ae1327a26dd53a691fc1b3e30eec8e6a6 17-Jun-2014 Juan Silveira <jjso@google.com> Keep pointers to extension values.

The current implementation of getExtension deserialises the field from bytes
and returns a new object every time. This means that changes to those objects
are reflected when the messages is serialised unless setExtension is called. It
also means that every call to getExtension and setExtension is expensive.

This change introduces a FieldData class that contains everything that's known
about the field at the time. This can be all the tag/byte[] pairs associated
with a given field or an Extension and a value object. This is so that two
messages with a repeated extension can be compared even if the extension
has been deserialised in one of them but not the other.

This change also adds FieldArray class based on SparseArray from the Android
compatibility library. This is used in ExtendableMessageNano to make lookup
of FieldDatas by their field number faster.

Implications:
* calling getExtension multiple times deserialises the field only once and
returns the same object.
* calling setExtension doesn't cause the object to be serialised immediately,
that only happens when the container message is serialised.
* getExtension is no longer a read-only thread-safe operation. README.txt has
been updated to relfect that.
* comparison using equals and hashCode continues to work.

Bug: 10863158

Change-Id: I81c7cb0c73cc0611a1f7c1eabf5eed259738e8bc
ava/README.txt
ava/pom.xml
ava/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
ava/src/main/java/com/google/protobuf/nano/Extension.java
ava/src/main/java/com/google/protobuf/nano/FieldArray.java
ava/src/main/java/com/google/protobuf/nano/FieldData.java
ava/src/main/java/com/google/protobuf/nano/UnknownFieldData.java
ava/src/test/java/com/google/protobuf/NanoTest.java
1a46f49f5b41dc18db5a8f2c63b894c650887bc8 03-Jul-2014 Max Cai <maxtroy@google.com> Fix how getRepeatedFieldArrayLength works

Change-Id: I01921eff008a8e3f7b1fbeb653d15ff8038d3220
ava/src/main/java/com/google/protobuf/nano/WireFormatNano.java
4c8e5262e3e739b850df6eac53b1a9ee7c8a4ba7 21-May-2014 Ying Wang <wangying@google.com> am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT

* commit '403cc9277c5540cf14b6e53a4fedf3ae5499f4cf':
You CANNOT change the global WITH_DEXPREOPT
f8b1f8314e84b8a174289c0ce492d154016fe7bd 21-May-2014 Baligh Uddin <baligh@google.com> am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce

* commit '39467629a7fb35da9fdfab4dd7603b9bfd7d9095':
403cc9277c5540cf14b6e53a4fedf3ae5499f4cf 21-May-2014 Ying Wang <wangying@google.com> am 8eed3705: You CANNOT change the global WITH_DEXPREOPT

* commit '8eed37054e8f7dd18aa3ec3070d638e3a1c03eaf':
You CANNOT change the global WITH_DEXPREOPT
39467629a7fb35da9fdfab4dd7603b9bfd7d9095 21-May-2014 Baligh Uddin <baligh@google.com> am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce

* commit '6c915d3a1e820702dca08d02a40fb86aa2de0bdd':
8eed37054e8f7dd18aa3ec3070d638e3a1c03eaf 02-May-2014 Ying Wang <wangying@google.com> You CANNOT change the global WITH_DEXPREOPT

Bug: 14380196
Change-Id: I2b9e6db081558687afd5c20c7084824dfe1bb26e
ndroid.mk
6c915d3a1e820702dca08d02a40fb86aa2de0bdd 21-May-2014 Baligh Uddin <baligh@google.com> keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce
0301b7c5b305d6c4fc275291328416f77695e24b 13-May-2014 Qiwen Zhao <zhao@google.com> reset with history at sha1 d5219df3ce036d4f43262bbda1016097a59a0c81
f2750dcb61de785aee6aa75b7b002dac3f1581bb 08-May-2014 Wink Saville <wink@google.com> am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp

* commit '2b549b793713eb10b0212f1c5d6c90d9fdeead85':
Revert "Merge commit 'e887563a' into fix-merge-conclict"
d1439291d0a2d6558903205676d41410c319587e 08-May-2014 Wink Saville <wink@google.com> Revert "Merge commit 'e887563a' into fix-merge-conclict"

This reverts commit f65ee55561e2a5f53be6db2ce03e518e249c9e80.

Change-Id: Ia6fed4d96fb4c076b2b51e1d758f3e15d37bffc0
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
2b549b793713eb10b0212f1c5d6c90d9fdeead85 08-May-2014 Wink Saville <wink@google.com> Merge "Revert "Merge commit 'e887563a' into fix-merge-conclict"" into klp-modular-dev-plus-aosp
3ba4cb66d8d3c0daabaaedbdb13c0bacfd979b69 08-May-2014 Wink Saville <wink@google.com> Revert "Merge commit 'e887563a' into fix-merge-conclict"

This reverts commit f65ee55561e2a5f53be6db2ce03e518e249c9e80.

Change-Id: Ia6fed4d96fb4c076b2b51e1d758f3e15d37bffc0
ava/README.txt
ava/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_message.cc
67ebd315682b27dc0d2233eabe23bd8cbb481378 08-May-2014 Jan-Willem Maarse <maarse@google.com> am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"

* commit '399cf8d641c0bad4cff016f3b1a02c63fb353a21':
0e54db6b8ac292b4193a924176a939d4326e803b 08-May-2014 Bill Yi <byi@google.com> am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD

* commit '8b5d62a4e819cb5114b294fc6754de63d50792b1':
cd8a72c726b398e3bea5dfcc07c1c9c40386511d 08-May-2014 Jeff Davidson <jpd@google.com> am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master

* commit '7b4e8c78004c479ffc99ec7c677e206cfdf8b73c':
3af26f43dc55563842cee8604f1e802bf40a2585 08-May-2014 Max Cai <maxtroy@google.com> am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"

* commit 'e69eaa2230952424fd410f3378445e78fcf58242':
90048528ee37be92be17cde8f351eb1b436cdc9e 08-May-2014 Max Cai <maxtroy@google.com> am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"

* commit '888cafe432fd2da8ae1b36429b5e8f822db11ce0':
16aad88f8a12afef0eea31709c8bc67f7c8bbdab 08-May-2014 Wink Saville <wink@google.com> am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""

* commit '13fb32b15d428e4633674b9bb8bb7d4750e7e909':
291f0484a489990b7d59a78b91792fa3d935eb5c 08-May-2014 Wink Saville <wink@google.com> Merge commit 'f65ee555' into fix-merge-conflict

* commit 'f65ee555':

Change-Id: Ic1216c50b608f1609fd8a1a1a50209c4486f30a4
399cf8d641c0bad4cff016f3b1a02c63fb353a21 07-May-2014 Jan-Willem Maarse <maarse@google.com> am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"

* commit '1fd235cbb5975e117909c73e5e3a579ae4c28dce':
8b5d62a4e819cb5114b294fc6754de63d50792b1 07-May-2014 Bill Yi <byi@google.com> am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD

* commit 'f4af48aeb5293a6c8583749e1a6f7a20508324f3':
7b4e8c78004c479ffc99ec7c677e206cfdf8b73c 07-May-2014 Jeff Davidson <jpd@google.com> am 8113c186: resolved conflicts for merge of 592b6078 to master

* commit '8113c1862afb4ff3b7ab4ba0044c5cb191c1e454':
e69eaa2230952424fd410f3378445e78fcf58242 07-May-2014 Max Cai <maxtroy@google.com> am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"

* commit '99c9801813fdc2eccd5db391c00d0250c327e344':
888cafe432fd2da8ae1b36429b5e8f822db11ce0 07-May-2014 Max Cai <maxtroy@google.com> am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"

* commit 'dd38a37eae035fe0f724438624694f1cf77a0ade':
13fb32b15d428e4633674b9bb8bb7d4750e7e909 07-May-2014 Wink Saville <wink@google.com> am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""

* commit '3f1679bb03e1d08f08e7b4ca2d024345201d7f01':
f65ee55561e2a5f53be6db2ce03e518e249c9e80 07-May-2014 Wink Saville <wink@google.com> Merge commit 'e887563a' into fix-merge-conclict

* commit 'e887563a':
Revert "am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize""

Change-Id: I1222ae20e6caef67c5a00ac481e10fe7b7d2a91c
de6420aa3fef9f6f85e88fd8e0c7667230d81753 07-May-2014 Wink Saville <wink@google.com> am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"

* commit 'd89b3060b40d8485d02e48d11056750495ecb577':
c8f69926325e0653ba4244dbd041c2d29b784194 07-May-2014 Wink Saville <wink@google.com> am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"

* commit '27243737cc739c25c8905cbe9b3040f500af127d':
9de5297388d67b5ddefdb3cf4e1f13a50f0a9c10 07-May-2014 Max Cai <maxtroy@google.com> am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."

* commit 'e8f7a71c113c692102115cf56071e7c24cf09c88':
0eaea6a8d71e3b323f2fe3bccb3829162c04e33c 07-May-2014 Max Cai <maxtroy@google.com> am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f

* commit '286f57055b99aa2c3c107f4cd8f49eeace8db5b5':
0ce2c26133762a55c52c0262bbe393370b806276 07-May-2014 Jie Dai <jied@google.com> am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp

* commit 'c7a7b2acc57bea137e4f8066802d4b9264ea3275':
d89b3060b40d8485d02e48d11056750495ecb577 07-May-2014 Wink Saville <wink@google.com> am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"

* commit 'f213b0c6a86503ad752139f04f343578df45db07':
27243737cc739c25c8905cbe9b3040f500af127d 07-May-2014 Wink Saville <wink@google.com> am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"

* commit '1a4b1d52e44104f2e10d0cdc585dde88602843d2':
e8f7a71c113c692102115cf56071e7c24cf09c88 07-May-2014 Max Cai <maxtroy@google.com> am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."

* commit '9141054bc24597968ddb94fb466c07cd2a933706':
286f57055b99aa2c3c107f4cd8f49eeace8db5b5 07-May-2014 Max Cai <maxtroy@google.com> am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f

* commit '5c3544dd69160dc00a7786977da220265a7c43c4':
c7a7b2acc57bea137e4f8066802d4b9264ea3275 07-May-2014 Jie Dai <jied@google.com> resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp

Change-Id: Ifa90d0c9bf3119607ce19c942fbfb0e4cffe6b38
0c063c66604c5dee434534ff775eb6d18ce4ed7b 07-May-2014 Max Cai <maxtroy@google.com> am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."

* commit 'fa7bf363b9b46a933c3c3c81ff7f75684760fba8':
06396abfe648b84e4c17d0e4a98a6cd34d57aaab 07-May-2014 Max Cai <maxtroy@google.com> am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."

* commit '2c210bb92ce2001e943b107710ba098295a55761':
e41d4c041cb2c6d58c4508cf792cd4e987991b2a 07-May-2014 Max Cai <maxtroy@google.com> am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."

* commit '0ea6895484185194b405af7bacfd1c6a0590d17c':
11b030c32e2b740283ddd455e1e29748667cf314 07-May-2014 Andrew Flynn <flynn@google.com> am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"

* commit 'db4556edf20010913f977322d1544bec77c9c181':
843619f3a85440e94d1cbec0f71173eb560d6d73 07-May-2014 Max Cai <maxtroy@google.com> am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."

* commit '649efad8ca2fd4a4770fddca4537b8a3d27be47c':
175d44dbf967c326956f5ee11cfe72cbd571601c 07-May-2014 Max Cai <maxtroy@google.com> am aa721735: am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"

* commit 'aa721735628bd0affc98f3204729b39cceeb60d8':
bfa5ee2ff6bde25e15bcf855f60208c01bf7fd5e 07-May-2014 The Android Open Source Project <initial-contribution@android.com> am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD

* commit '2f8797132c9bca0235d4e937768625f432647d00':
6a76a968d2c5c22a313dd2646d1b2941d17ff89d 07-May-2014 The Android Open Source Project <initial-contribution@android.com> am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD

* commit 'dee682fd34a78eb0335df215b72a7c5de6520170':
fafcc5b4f42837ab05c9cf1f390e7e4a6b370f2e 07-May-2014 Max Cai <maxtroy@google.com> am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."

* commit '5645677fddfd957ca8460f81b634a7108e50bd36':
7630b4785d2675d37a272dc274318bd5a77c3805 07-May-2014 Max Cai <maxtroy@google.com> am f2d09988: am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."

* commit 'f2d09988508c1aa6a2da63944036d21126ca82f8':
4d28b813b64ccc215cd462de7f33455abbe04d0b 07-May-2014 Max Cai <maxtroy@google.com> am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."

* commit '5e0c3d21a0bd7065044b0b01b828940f5e1cb2a9':
fdf5bde4157bb3e5a5dc36d4acda930fd74933f1 07-May-2014 Max Cai <maxtroy@google.com> am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."

* commit '4ba333e8f251f9c8b27892452101ac31ffa38cae':
be303d0372ccf9e2fbc0abf238b925142ba0a8bf 07-May-2014 Max Cai <maxtroy@google.com> am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."

* commit 'd734d52f6ae689cd6efb768383056b5fb7ef3320':
2693b3aadbddaa28c4f9b4f3f11236b986f15557 07-May-2014 Max Cai <maxtroy@google.com> am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."

* commit '92d0bd2567355384de6c1b0f2662f6d0c0a94707':
a84e8aa6cd9b98e52d70d93ab10cbdf9c48c5a26 07-May-2014 Max Cai <maxtroy@google.com> am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"

* commit 'fc9db907250a8d8f3e60ba57d8073a6ca8169d36':
c45fb6a2338edd7c900fcd3612da79ec9d0a43e5 07-May-2014 Max Cai <maxtroy@google.com> am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."

* commit '6988e26be6d502789e7c1bed36e72873546d223a':
b2a7fc6b0585f3c53ea8110a8740141847f3394e 07-May-2014 Max Cai <maxtroy@google.com> am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."

* commit 'f97b9cedc0160a0c13ba18467b8b3b38746b64bb':
ab8cc07120d0fbb6ea4982459bc4238f0eea61bd 07-May-2014 Max Cai <maxtroy@google.com> am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."

* commit 'e4bf716d77655a9434de44442663682f2ba5fbc1':
aa2afb0865fa9c15dcaf657d13c5144186548320 07-May-2014 Max Cai <maxtroy@google.com> am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge

* commit 'caf351056c6ce99dd4000003d84774ad953877fe':
6ed6b682a2b93135e3f5cffc7e7627b879354c82 07-May-2014 Max Cai <maxtroy@google.com> am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."

* commit 'f593c0a51e5c901f9aa9d18857765f464808afee':
f7bbfdfd53b1fbe0073eaa2b132d358edae2b545 07-May-2014 Ulas Kirazci <ulas@google.com> am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"

* commit '4dfa34e224c3d961c0d84e3a3b848f01e55d746c':
ea95349d36ad1894fd68b23b04bc9a6422adeeb0 07-May-2014 Ulas Kirazci <ulas@google.com> am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."

* commit '90e065ddd7c3a620ee4f6160bf1227fdfe57a63f':
b624b3aa455ecf71c44bde4cf7488e7c199a0b8a 07-May-2014 Wink Saville <wink@google.com> am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"

* commit '554bd9578e0c8ec4eea8130abaca7c91fdc46e61':
a6ddccbbac403dbe6fce5623768755c08d41c962 07-May-2014 Ulas Kirazci <ulas@google.com> am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."

* commit 'e9a0bb712f71d60dfb4266f8e2f56fac3a488984':
a8b4f97f34c7505fb1d1bc87ebe4c83f7032454c 07-May-2014 Ulas Kirazci <ulas@google.com> am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."

* commit '2b9bfa3dd5f3e915120f480f3f8d16dd0f70747f':
6d1e97097eca8f50e629c10fcabbffbe064868b8 07-May-2014 Ulas Kirazci <ulas@google.com> am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."

* commit 'a5df326138cdaf4874026c09e2967d8142eca811':
998ea484ba19563fd32ba3e2e16e785f449afa74 07-May-2014 Ulas Kirazci <ulas@google.com> am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"

* commit '194529f1952e4d873c8262e09a40ac71872859d2':
ede9a1f51eeff78ee4776858a17bda2d94e3edc5 07-May-2014 Ulas Kirazci <ulas@google.com> am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."

* commit '8c131d5bf75499455ce287aeb0af30030282a000':
67f3f6aa6d6b43d596ab5a572c6ae34fb60a8066 07-May-2014 Adam Metcalf <gamblore@google.com> am 4104f751: am 380d1b5a: Fix the merge conflict leftovers.

* commit '4104f751dbabfc2dd04adee381aa4d949f81dbe1':
f3bf05831fdad617a7841d7943a9f6f5797582a8 07-May-2014 Wink Saville <wink@google.com> am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc

* commit '662d2f44e91af91a37a59f1fe1697a00b6b724c9':
2fb1789c06fa82f73d136d83189ad1a54043348d 07-May-2014 Wink Saville <wink@google.com> am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit '66a4ccc40cc4eb1d21c273ded0e38f17ccdc4ded':
50ddd7addefb02ca23efd2f2c60442f91e276792 07-May-2014 Wink Saville <wink@google.com> am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."

* commit '7022c115663ac6e24afdc896fc6f155f1a9bc52c':
05f45faa5951f5ae0d05e0a4a9f5249339df31b4 07-May-2014 Wink Saville <wink@google.com> am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit 'efa53b19f45400ca98c1bb2dc1f5bfa87be033df':
77140fb2a041eec2ef96cff59f8fa81c9355fcf3 07-May-2014 Wink Saville <wink@google.com> am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."

* commit '211bb9125a78b3b8772afc196e16640a8b7f2f7b':
fa7bf363b9b46a933c3c3c81ff7f75684760fba8 07-May-2014 Max Cai <maxtroy@google.com> am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."

* commit '6a1f70ab855a3c222783596c92574267e3cfa6e8':
2c210bb92ce2001e943b107710ba098295a55761 07-May-2014 Max Cai <maxtroy@google.com> am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."

* commit '6adb3df8b7d5f5deb42b6b4a9e7fe76638faa6fe':
0ea6895484185194b405af7bacfd1c6a0590d17c 07-May-2014 Max Cai <maxtroy@google.com> am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."

* commit 'a5273888480392ff8a8b0ea3af6617e18dbb1ed2':
db4556edf20010913f977322d1544bec77c9c181 07-May-2014 Andrew Flynn <flynn@google.com> am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"

* commit '81d0f437ba2bb34cd59a019c2f15f862a9c5d45b':
649efad8ca2fd4a4770fddca4537b8a3d27be47c 07-May-2014 Max Cai <maxtroy@google.com> am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."

* commit '55c3d6d9fa8287676c6502ad20199bd932730681':
aa721735628bd0affc98f3204729b39cceeb60d8 07-May-2014 Max Cai <maxtroy@google.com> am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"

* commit '7c0eadd45cb4e0fef8afffe1626c2e4711418b49':
2f8797132c9bca0235d4e937768625f432647d00 07-May-2014 The Android Open Source Project <initial-contribution@android.com> am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD

* commit 'da929e3ea6310e7dc46745f191200afc489600e6':
dee682fd34a78eb0335df215b72a7c5de6520170 07-May-2014 The Android Open Source Project <initial-contribution@android.com> am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD

* commit '6597e4f210be48b731e995c6c9950046ccf7689b':
5645677fddfd957ca8460f81b634a7108e50bd36 07-May-2014 Max Cai <maxtroy@google.com> am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."

* commit 'b3ad7eaeb3233d9842a74e2252efa189d4c0524a':
f2d09988508c1aa6a2da63944036d21126ca82f8 07-May-2014 Max Cai <maxtroy@google.com> am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."

* commit '4115d56f3d03ca788a08a0a1eb6c79fa107550d3':
5e0c3d21a0bd7065044b0b01b828940f5e1cb2a9 07-May-2014 Max Cai <maxtroy@google.com> am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."

* commit '139bd6ac80ca61f85796bded692eeb5bb932cfca':
4ba333e8f251f9c8b27892452101ac31ffa38cae 07-May-2014 Max Cai <maxtroy@google.com> am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."

* commit 'b88c1729d89e76b06ae3b87d90cae6ea36cfde90':
d734d52f6ae689cd6efb768383056b5fb7ef3320 07-May-2014 Max Cai <maxtroy@google.com> am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."

* commit '8eda9d3f991c62237a24e4d9f8e7f58df1687a86':
92d0bd2567355384de6c1b0f2662f6d0c0a94707 07-May-2014 Max Cai <maxtroy@google.com> am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."

* commit 'e2cbcf3853917c6ce1fcc0cbcc00b747db7798fe':
fc9db907250a8d8f3e60ba57d8073a6ca8169d36 07-May-2014 Max Cai <maxtroy@google.com> am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"

* commit '0610e6834fa213c026d91fab037a649613840f44':
6988e26be6d502789e7c1bed36e72873546d223a 07-May-2014 Max Cai <maxtroy@google.com> am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."

* commit '4b359335e94c44fa16b78c1406f3cd71b7fbf40b':
f97b9cedc0160a0c13ba18467b8b3b38746b64bb 07-May-2014 Max Cai <maxtroy@google.com> am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."

* commit '677d51bb86ca57654617dae9fe645995a1b22658':
e4bf716d77655a9434de44442663682f2ba5fbc1 07-May-2014 Max Cai <maxtroy@google.com> am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."

* commit '8f903e123aff94f272aaae22e275924980433a47':
caf351056c6ce99dd4000003d84774ad953877fe 07-May-2014 Max Cai <maxtroy@google.com> am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge

* commit '0e5add1dd4a5ce73ff10b38307bae942be178d5b':
f593c0a51e5c901f9aa9d18857765f464808afee 07-May-2014 Max Cai <maxtroy@google.com> am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."

* commit 'ee8847c131e91c718a0f4d2af73ec56d9fd24d81':
4dfa34e224c3d961c0d84e3a3b848f01e55d746c 07-May-2014 Ulas Kirazci <ulas@google.com> am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"

* commit 'dc8f4a8bc871cf1ba6a27eaf7f581a144571411a':
90e065ddd7c3a620ee4f6160bf1227fdfe57a63f 07-May-2014 Ulas Kirazci <ulas@google.com> am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."

* commit 'ca07ad9d617b3ebab5d66077413bdfc7673a2926':
554bd9578e0c8ec4eea8130abaca7c91fdc46e61 07-May-2014 Wink Saville <wink@google.com> am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"

* commit 'd6be7db044050f9941ff7b7a3e57af0565d4e53c':
e9a0bb712f71d60dfb4266f8e2f56fac3a488984 07-May-2014 Ulas Kirazci <ulas@google.com> am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."

* commit '5f8ef51529f07ae758ec4944759828a1414dbb7c':
2b9bfa3dd5f3e915120f480f3f8d16dd0f70747f 07-May-2014 Ulas Kirazci <ulas@google.com> am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."

* commit 'c1f9ebcefb026a84e369347ddc23a3e4c6e9c940':
a5df326138cdaf4874026c09e2967d8142eca811 07-May-2014 Ulas Kirazci <ulas@google.com> am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."

* commit 'c017bb8c147d30641b36e6d16b9133c0dd9e8453':
194529f1952e4d873c8262e09a40ac71872859d2 07-May-2014 Ulas Kirazci <ulas@google.com> am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"

* commit '6778e0a0198f602cab76daf6428a97292007dc71':
8c131d5bf75499455ce287aeb0af30030282a000 07-May-2014 Ulas Kirazci <ulas@google.com> am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."

* commit 'bbda8b10152bbdb7d6057724f0e3e197db9ec108':
4104f751dbabfc2dd04adee381aa4d949f81dbe1 07-May-2014 Adam Metcalf <gamblore@google.com> am 380d1b5a: Fix the merge conflict leftovers.

* commit '380d1b5a78de07a081b36c890321ac61a0fced1a':
Fix the merge conflict leftovers.
662d2f44e91af91a37a59f1fe1697a00b6b724c9 07-May-2014 Wink Saville <wink@google.com> am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc

* commit 'adfb09a08d450f356a69c74c0a80a3e4573e20b8':
66a4ccc40cc4eb1d21c273ded0e38f17ccdc4ded 07-May-2014 Wink Saville <wink@google.com> am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit 'df9a6dffee90f5ff657265b415ee5eb9fb5e3960':
7022c115663ac6e24afdc896fc6f155f1a9bc52c 07-May-2014 Wink Saville <wink@google.com> am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."

* commit 'ba363f1380e9b99e6606462b21febd2e4027e340':
efa53b19f45400ca98c1bb2dc1f5bfa87be033df 07-May-2014 Wink Saville <wink@google.com> am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit '4d7f9ad71771fff628e88d463af94b44457b7934':
211bb9125a78b3b8772afc196e16640a8b7f2f7b 07-May-2014 Wink Saville <wink@google.com> am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."

* commit 'f105476adedac50be509ed36cbb187b92fca54d9':
165d4d7e343099e4b84137b852a0a2070c27bba4 02-May-2014 Ying Wang <wangying@google.com> am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"

* commit 'bf6d9ec1fa2e1313c2ca8558c5f0710cbea201c1':
You CANNOT change the global WITH_DEXPREOPT
bf6d9ec1fa2e1313c2ca8558c5f0710cbea201c1 02-May-2014 Ying Wang <wangying@google.com> am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"

* commit '94f522f907e3f34f70d9e7816b947e62fddbb267':
You CANNOT change the global WITH_DEXPREOPT
94f522f907e3f34f70d9e7816b947e62fddbb267 02-May-2014 Ying Wang <wangying@google.com> am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"

* commit '49512cb01065b41c0113248c2c02800de1156d50':
You CANNOT change the global WITH_DEXPREOPT
49512cb01065b41c0113248c2c02800de1156d50 02-May-2014 Ying Wang <wangying@google.com> Merge "You CANNOT change the global WITH_DEXPREOPT"
eaa37c503adff80aa6a99d1503bd0d0343a93a23 02-May-2014 Ying Wang <wangying@google.com> You CANNOT change the global WITH_DEXPREOPT

Bug: 14380196
Change-Id: I2b9e6db081558687afd5c20c7084824dfe1bb26e
ndroid.mk
1fd235cbb5975e117909c73e5e3a579ae4c28dce 01-May-2014 Jan-Willem Maarse <maarse@google.com> am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"

* commit '70eec2cabb5fa7bf8d7d492ec46905dae3df5a76':
Fix NPE when clearing an extension in nano protos
70eec2cabb5fa7bf8d7d492ec46905dae3df5a76 01-May-2014 Jan-Willem Maarse <maarse@google.com> am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"

* commit '58eb8e98d17971273548930a7e8d45e69995a2c8':
Fix NPE when clearing an extension in nano protos
58eb8e98d17971273548930a7e8d45e69995a2c8 01-May-2014 Jan-Willem Maarse <maarse@google.com> am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"

* commit 'd20f0a4260763531acf5de677e4830afe0bfc53e':
Fix NPE when clearing an extension in nano protos
d20f0a4260763531acf5de677e4830afe0bfc53e 01-May-2014 Jan-Willem Maarse <maarse@google.com> Merge "Fix NPE when clearing an extension in nano protos"
1ee2760aed05bf072a05fd7b6aeb158691a5dfbc 01-May-2014 Jan-Willem Maarse <maarse@google.com> Fix NPE when clearing an extension in nano protos

If ExtendableMessageNano doesn't have any unknown fields, trying to
clear an extension by setting it to null would throw an NPE.

Change-Id: I6abcdfcc0193de44f97b21dd6cc2f40604938a1a
ava/src/main/java/com/google/protobuf/nano/Extension.java
ava/src/test/java/com/google/protobuf/NanoTest.java
f4af48aeb5293a6c8583749e1a6f7a20508324f3 30-Apr-2014 Bill Yi <byi@google.com> am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD

* commit '9dde6a6d6b6f8e0a96fd3634f7e033fc30bc11e5':
9dde6a6d6b6f8e0a96fd3634f7e033fc30bc11e5 30-Apr-2014 Bill Yi <byi@google.com> am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD

* commit 'ddeaf25683a5aa4d6e7ef784c7380c9332cdb3ce':
ddeaf25683a5aa4d6e7ef784c7380c9332cdb3ce 29-Apr-2014 Bill Yi <byi@google.com> Merge commit 'ba89934bdae7f4256c94a0a24992903a114e764f' into HEAD
8113c1862afb4ff3b7ab4ba0044c5cb191c1e454 26-Apr-2014 Jeff Davidson <jpd@google.com> resolved conflicts for merge of 592b6078 to master

Change-Id: I4c9cebcc6922a970daca2af002c96bc7e8e102b8
592b60785ff2c47bd14df4b213b648587f93faef 26-Apr-2014 Jeff Davidson <jpd@google.com> am 33a6680a: Merge "Support generation of Parcelable nano messages."

* commit '33a6680ab98977cd5b9b7b03f4875b9265cfec3b':
Support generation of Parcelable nano messages.
33a6680ab98977cd5b9b7b03f4875b9265cfec3b 26-Apr-2014 Jeff Davidson <jpd@google.com> Merge "Support generation of Parcelable nano messages."
721ea491a8e3e9ea5a130965dc5761fc335c3e61 23-Apr-2014 Jeff Davidson <jpd@google.com> Support generation of Parcelable nano messages.

This CL adds the "parcelable_messages" option. When enabled, all
generated message classes will conform to the Android Parcelable
contract. This is achieved by introducing a new parent class for
generated classes which implements the required functionality.

Since the store_unknown_fields option also makes use of a superclass,
ExtendableMessageNano, we have two versions of the new Parcelable
superclass: one extending MessageNano, and one extending
ExtendableMessageNano. These classes are otherwise identical.

As these classes depend on Android framework jars, they are not
included in the host .jar build of the nanoproto library.

Finally, add a test suite for running tests of Android-specific
functionality, as this cannot be done on a desktop JVM.

Change-Id: Icc2a257f03317e947f7078dbb9857c3286857497
ndroid.mk
uild.gradle
ava/README.txt
ava/src/device/main/java/com/google/protobuf/nano/android/ParcelableExtendableMessageNano.java
ava/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNano.java
ava/src/device/main/java/com/google/protobuf/nano/android/ParcelingUtil.java
ava/src/device/test/AndroidManifest.xml
ava/src/device/test/java/com/google/protobuf/nano/NanoAndroidTest.java
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_params.h
99c9801813fdc2eccd5db391c00d0250c327e344 24-Apr-2014 Max Cai <maxtroy@google.com> am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"

* commit '43365182bcd23a011476fb5e57930f1829da41fa':
Adds --ignore_service nano proto compiler flag
43365182bcd23a011476fb5e57930f1829da41fa 24-Apr-2014 Max Cai <maxtroy@google.com> am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"

* commit '829f6c014ce69d04593d30652c8acc2f7a793851':
Adds --ignore_service nano proto compiler flag
829f6c014ce69d04593d30652c8acc2f7a793851 24-Apr-2014 Max Cai <maxtroy@google.com> Merge "Adds --ignore_service nano proto compiler flag"
a0a4f14521bd29a472d51fb7c4c5c45a82643453 21-Apr-2014 Jie Dai <jied@google.com> Adds --ignore_service nano proto compiler flag

Nano proto compiler normally throws an error if any service is
defined. If --ignore-services=true is set, no error is thrown and the
service is simply skipped.

Change-Id: Id82583555085cc55550d03a485d3f0189885240b
ava/README.txt
rc/google/protobuf/compiler/javanano/javanano_file.cc
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_params.h
dd38a37eae035fe0f724438624694f1cf77a0ade 14-Apr-2014 Max Cai <maxtroy@google.com> am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"

* commit '0391f00be135d1a52052d50171c38e9f0129031d':
Don't reset cachedSize to 0 in getSerializedSize
0391f00be135d1a52052d50171c38e9f0129031d 14-Apr-2014 Max Cai <maxtroy@google.com> am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"

* commit 'ea68d73c08b3b9319faef8ef9cd283e773a6ef20':
Don't reset cachedSize to 0 in getSerializedSize
ea68d73c08b3b9319faef8ef9cd283e773a6ef20 14-Apr-2014 Max Cai <maxtroy@google.com> Merge "Don't reset cachedSize to 0 in getSerializedSize"
c82101204dcde798f870d95e91f5483c3e57eb29 20-Mar-2014 Dave Hawkey <dhawkey@google.com> Don't reset cachedSize to 0 in getSerializedSize

This avoids a race-condition when cachedSize is momentarily set to 0
for non-empty messages if multiple threads call getSerializedSize
(e.g. during serialization).

This is a retry of https://android-review.googlesource.com/#/c/88570/.
getSerializedSize() has been kept non-final so that messages generated
with a previous version of the compiler will not break.

Change-Id: I8d8154a10938cde579ae19c55eae55b1e70e0bda
ava/README.txt
ava/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_message.cc
3f1679bb03e1d08f08e7b4ca2d024345201d7f01 24-Mar-2014 Wink Saville <wink@google.com> am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""

* commit '8a9fc09c92cf0b1f08186c9339952e47eddee74b':
Revert "Don't reset cachedSize to 0 in getSerializedSize"
ba89934bdae7f4256c94a0a24992903a114e764f 22-Mar-2014 Wink Saville <wink@google.com> am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""

* commit 'ce2f59915e0b41c935e3f72a2b7b71b6c19b6860':
Revert "Don't reset cachedSize to 0 in getSerializedSize"
8a9fc09c92cf0b1f08186c9339952e47eddee74b 22-Mar-2014 Wink Saville <wink@google.com> am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""

* commit 'ce2f59915e0b41c935e3f72a2b7b71b6c19b6860':
Revert "Don't reset cachedSize to 0 in getSerializedSize"
ce2f59915e0b41c935e3f72a2b7b71b6c19b6860 22-Mar-2014 Wink Saville <wink@google.com> Merge "Revert "Don't reset cachedSize to 0 in getSerializedSize""
2d849337400b64ee913ece4631d3b2dbc95f20d8 22-Mar-2014 Wink Saville <wink@google.com> Revert "Don't reset cachedSize to 0 in getSerializedSize"

This reverts commit c6e12c6702ca764486f952654ba1568f00efe813.
ava/README.txt
ava/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_message.cc
e887563af628efea8f49b1393d30c33107b198e0 22-Mar-2014 Wink Saville <wink@google.com> Revert "am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize""

This reverts commit f213b0c6a86503ad752139f04f343578df45db07, reversing
changes made to 1a4b1d52e44104f2e10d0cdc585dde88602843d2.
ava/README.txt
ava/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_message.cc
f213b0c6a86503ad752139f04f343578df45db07 22-Mar-2014 Wink Saville <wink@google.com> am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"

* commit '5b931dc798d882754f3e7a876fc6d820fa371e95':
Don't reset cachedSize to 0 in getSerializedSize
5b931dc798d882754f3e7a876fc6d820fa371e95 21-Mar-2014 Wink Saville <wink@google.com> am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"

* commit 'ec0b12c34a6329d2f98003e9102fe2d75726c797':
Don't reset cachedSize to 0 in getSerializedSize
824ee2bfab83d1fbe725d4c23e86161592218954 21-Mar-2014 Wink Saville <wink@google.com> am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"

* commit 'ec0b12c34a6329d2f98003e9102fe2d75726c797':
Don't reset cachedSize to 0 in getSerializedSize
ec0b12c34a6329d2f98003e9102fe2d75726c797 21-Mar-2014 Wink Saville <wink@google.com> Merge "Don't reset cachedSize to 0 in getSerializedSize"
c6e12c6702ca764486f952654ba1568f00efe813 20-Mar-2014 Dave Hawkey <dhawkey@google.com> Don't reset cachedSize to 0 in getSerializedSize

This avoids a race-condition when cachedSize is momentarily set to 0
for non-empty messages if multiple threads call getSerializedSize
(e.g. during serialization).

Change-Id: I15a8ded92edbf41bf1c8d787960c5bbbc8a323c5
ava/README.txt
ava/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_message.cc
d816355844c620fa1353291d07d23c5bf274d6bd 08-Mar-2014 Wink Saville <wink@google.com> am 51ef8f39: Merge "Fix compile error on mac 10.9"

* commit '51ef8f39de376fe71ce5d2c682abe4f974cf8074':
Fix compile error on mac 10.9
5ef399084ba423f9d842bc4ee2d2986b2879d705 07-Mar-2014 Max Cai <maxtroy@google.com> am afc1553a: Merge "Extension overhaul."

* commit 'afc1553a9eb56eff742828c9c819eafa363cdcc9':
Extension overhaul.
c235d777f0f442b8f2e7a4a7389341524c7c64ae 07-Mar-2014 Max Cai <maxtroy@google.com> am 447f664a: Merge changes I9fecff3c,I2c1eb07f

* commit '447f664aef6694bb9fb3db85d6166d908cde8a8d':
Fix repeated packed field merging code for non-packed data.
Add validation when parsing enum fields.
1a4b1d52e44104f2e10d0cdc585dde88602843d2 21-Feb-2014 Wink Saville <wink@google.com> am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"

* commit '0031029939c440e42e8e43cea3401f135c1af7d6':
Fix compile error on mac 10.9
0031029939c440e42e8e43cea3401f135c1af7d6 21-Feb-2014 Wink Saville <wink@google.com> am 51ef8f39: Merge "Fix compile error on mac 10.9"

* commit '51ef8f39de376fe71ce5d2c682abe4f974cf8074':
Fix compile error on mac 10.9
51ef8f39de376fe71ce5d2c682abe4f974cf8074 21-Feb-2014 Wink Saville <wink@google.com> Merge "Fix compile error on mac 10.9"
f03ad1a96ff9a713e26eccebad15c5ecd76ca911 21-Feb-2014 Wink Saville <wink@google.com> Fix compile error on mac 10.9

Add #<include> istream to message.cc which was the solution to this bug:

https://code.google.com/p/protobuf/issues/detail?id=570

Change-Id: Ic63730fdbe73234bf7efdd50ff0b55bb11ca0fd4
rc/google/protobuf/message.cc
9141054bc24597968ddb94fb466c07cd2a933706 17-Feb-2014 Max Cai <maxtroy@google.com> am 214997ce: am afc1553a: Merge "Extension overhaul."

* commit '214997cefa5554c3670ea76293bbf751111704e4':
Extension overhaul.
214997cefa5554c3670ea76293bbf751111704e4 17-Feb-2014 Max Cai <maxtroy@google.com> am afc1553a: Merge "Extension overhaul."

* commit 'afc1553a9eb56eff742828c9c819eafa363cdcc9':
Extension overhaul.
afc1553a9eb56eff742828c9c819eafa363cdcc9 17-Feb-2014 Max Cai <maxtroy@google.com> Merge "Extension overhaul."
5c3544dd69160dc00a7786977da220265a7c43c4 10-Feb-2014 Max Cai <maxtroy@google.com> am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f

* commit '5d33d23ded77a145f59a915f19044aa14335d93b':
Fix repeated packed field merging code for non-packed data.
Add validation when parsing enum fields.
5d33d23ded77a145f59a915f19044aa14335d93b 10-Feb-2014 Max Cai <maxtroy@google.com> am 447f664a: Merge changes I9fecff3c,I2c1eb07f

* commit '447f664aef6694bb9fb3db85d6166d908cde8a8d':
Fix repeated packed field merging code for non-packed data.
Add validation when parsing enum fields.
447f664aef6694bb9fb3db85d6166d908cde8a8d 10-Feb-2014 Max Cai <maxtroy@google.com> Merge changes I9fecff3c,I2c1eb07f

* changes:
Fix repeated packed field merging code for non-packed data.
Add validation when parsing enum fields.
f4523ddb8a4e6f1008bfec2ee9e39629be792639 16-Jan-2014 Max Cai <maxtroy@google.com> Fix repeated packed field merging code for non-packed data.

Enum fix is already included in the previous commit.

Bug: https://code.google.com/p/android/issues/detail?id=64893
Change-Id: I9fecff3c8822918a019028eb57fa39b361a2c960
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
d888895a3b5cf764856d3a94ed526bf9994c1800 15-Jan-2014 Max Cai <maxtroy@google.com> Add validation when parsing enum fields.

Invalid values from the wire are silently ignored.
Unlike full/lite, the invalid values are not stored into the
unknown fields, because there's no way to get them out from
Nano's unknown fields without a matching Extension.

Edited README and slightly moved it towards a standalone
section for Nano, independent of the Micro section.

Change-Id: I2c1eb07f4d6d8f3aea242b8ddd95b9c966f3f177
ava/README.txt
ava/pom.xml
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_enum_field.h
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/unittest_enum_validity_nano.proto
6965d8913f45eb8a7cb0711dea4301fc75c4ee1b 15-Jan-2014 Jie Dai <jied@google.com> Modify the gradle file to fit code hierachy with package name

Change-Id: I99adc3c857d7851b8d99e01c75c15e9c42c37eb7
uild.gradle
6a1f70ab855a3c222783596c92574267e3cfa6e8 14-Jan-2014 Max Cai <maxtroy@google.com> am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."

* commit 'd5219df3ce036d4f43262bbda1016097a59a0c81':
Allow whitespace in nano codegen options.
d5219df3ce036d4f43262bbda1016097a59a0c81 14-Jan-2014 Max Cai <maxtroy@google.com> am a8af729b: Merge "Allow whitespace in nano codegen options."

* commit 'a8af729b5ef822971f025a7e8ff197545986910d':
Allow whitespace in nano codegen options.
a8af729b5ef822971f025a7e8ff197545986910d 14-Jan-2014 Max Cai <maxtroy@google.com> Merge "Allow whitespace in nano codegen options."
4109e91ce6035f84fa32b2e949501befbfb90159 14-Jan-2014 Max Cai <maxtroy@google.com> Allow whitespace in nano codegen options.

So we don't need to keep all option in a single line in the .mk files.

Change-Id: I786b879b334cac4cd13b32fabcb76efe53b4ac80
ndroid.mk
ava/README.txt
ava/pom.xml
rc/google/protobuf/compiler/javanano/javanano_generator.cc
6adb3df8b7d5f5deb42b6b4a9e7fe76638faa6fe 13-Jan-2014 Max Cai <maxtroy@google.com> am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."

* commit '1be96c579a34924bd20f19a0911b101ade08b0f3':
Correctness: floating point equality using bits instead of ==.
a5273888480392ff8a8b0ea3af6617e18dbb1ed2 13-Jan-2014 Max Cai <maxtroy@google.com> am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."

* commit '538abc5b6514460fce1e72da9f49591c6d4ba2e0':
Don't serialize required fields whose 'has' flags are unset.
1be96c579a34924bd20f19a0911b101ade08b0f3 13-Jan-2014 Max Cai <maxtroy@google.com> am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."

* commit '4b5874fad099faefb469c632e4c7b854cea733ae':
Correctness: floating point equality using bits instead of ==.
538abc5b6514460fce1e72da9f49591c6d4ba2e0 13-Jan-2014 Max Cai <maxtroy@google.com> am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."

* commit 'd6aeae143cde31b79a2d57a3ee0e41d9083d232d':
Don't serialize required fields whose 'has' flags are unset.
4b5874fad099faefb469c632e4c7b854cea733ae 13-Jan-2014 Max Cai <maxtroy@google.com> Merge "Correctness: floating point equality using bits instead of ==."
d6aeae143cde31b79a2d57a3ee0e41d9083d232d 13-Jan-2014 Max Cai <maxtroy@google.com> Merge "Don't serialize required fields whose 'has' flags are unset."
04e0fa44e105bc644bf07ba5154fc4a1ca4baec2 09-Jan-2014 Max Cai <maxtroy@google.com> Correctness: floating point equality using bits instead of ==.

Special values for float and double make it inaccurate to test the equality with ==.
The main Java library uses the standard Object.equals() implementation for all fields,
which for floating point fields means Float.equals() or Double.equals(). They define
equality as bitwise equality, with all NaN representations normalized to the same bit
sequence (and therefore equal to each other). This test checks that the nano
implementation complies with Object.equals(), so NaN == NaN and +0.0 != -0.0.

Change-Id: I97bb4a3687223d8a212c70cd736436b9dd80c1d7
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/unittest_accessors_nano.proto
rc/google/protobuf/unittest_has_nano.proto
f84177299a76759be1eb925093b059aef246fc0e 10-Jan-2014 Max Cai <maxtroy@google.com> Don't serialize required fields whose 'has' flags are unset.

Change-Id: Ibbe944fff83e44a8f2206e18ee9ec6f10661297a
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/unittest_has_nano.proto
382ddccb550e1c822ef26a0e65988998f7446624 20-Nov-2013 Max Cai <maxtroy@google.com> Extension overhaul.

- Get rid of TypeLiteral<T>. It was introduced to read the component
type of a List<T> at runtime. But we use arrays everywhere else,
and we can always read the component type of an array type at
runtime.
- Properly read/write "minor" types (e.g. sint32, sfixed32). The old
implementation could only read/write data as the "typical" types
(one per Java type), e.g. java.lang.Integer -> int32, java.lang.Long
-> int64. So if e.g. an extension specifies sfixed32 as the type, it
would be read/written in the totally incompatible int32 format.
- Properly serialize repeated packed fields. The old implementation
doesn't do packed serialization. As an added bonus, and to be more
aligned with the rest of protobuf nano / main, repeated packable
extensions can deserialize both packed and non-packed data.
- Split Extension class into a hierarchy so under typical usage a
large chunk of code dealing with primitive type extensions can be
removed by ProGuard.

Bug: https://code.google.com/p/android/issues/detail?id=62586
Change-Id: I0d692f35cc2a8ad3a5a1cb3ce001282b2356b041
ava/pom.xml
ava/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java
ava/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
ava/src/main/java/com/google/protobuf/nano/Extension.java
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/main/java/com/google/protobuf/nano/WireFormatNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_extension.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.h
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/unittest_extension_nano.proto
rc/google/protobuf/unittest_extension_packed_nano.proto
rc/google/protobuf/unittest_extension_repeated_nano.proto
rc/google/protobuf/unittest_extension_singular_nano.proto
81d0f437ba2bb34cd59a019c2f15f862a9c5d45b 19-Dec-2013 Andrew Flynn <flynn@google.com> am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"

* commit 'a896c1d8699a3a14aae94b7067339ebc5cccc794':
Fix MessageNanoPrinter for accessors
a896c1d8699a3a14aae94b7067339ebc5cccc794 19-Dec-2013 Andrew Flynn <flynn@google.com> am e7741c06: Merge "Fix MessageNanoPrinter for accessors"

* commit 'e7741c064ee4cdc5fa41e6444ed45131672fed97':
Fix MessageNanoPrinter for accessors
e7741c064ee4cdc5fa41e6444ed45131672fed97 19-Dec-2013 Andrew Flynn <flynn@google.com> Merge "Fix MessageNanoPrinter for accessors"
6b594c228e7954eb98353ad8e242b83fb255a277 12-Dec-2013 Andrew Flynn <flynn@google.com> Fix MessageNanoPrinter for accessors

accessors mode switches proto fields away from being public fields (which is
how MessageNanoPrinter found which fields to print via reflection). Add a
pass through the methods looking for generated accessor methods to print
those as well.

Change-Id: I7c47853ecbd5534086f44b25a89dbbe56f63ed03
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
ava/src/test/java/com/google/protobuf/NanoTest.java
55c3d6d9fa8287676c6502ad20199bd932730681 10-Dec-2013 Max Cai <maxtroy@google.com> am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."

* commit '6b9d96b2a3b32c141e2b105fcfde4f4b0dfae3f5':
Avoid class initializers to help ProGuard.
6b9d96b2a3b32c141e2b105fcfde4f4b0dfae3f5 10-Dec-2013 Max Cai <maxtroy@google.com> am 3f9bd998: Merge "Avoid class initializers to help ProGuard."

* commit '3f9bd9989c79db575b83e2f96b48c695f30ca153':
Avoid class initializers to help ProGuard.
3f9bd9989c79db575b83e2f96b48c695f30ca153 10-Dec-2013 Max Cai <maxtroy@google.com> Merge "Avoid class initializers to help ProGuard."
5cc242074f189837b38e7768b57ccfb0bca258df 09-Oct-2013 Max Cai <maxtroy@google.com> Avoid class initializers to help ProGuard.

Class initializers prevent ProGuard from inlining any methods
because it thinks the class initializer may have side effects.
This is true for static methods, but instance methods can still
be inlined, because to have an instance you will have touched
the class and any class initializers would have run. But
ProGuard only starts inlining instance methods of classes with
class initializers from v4.11b6, and Android uses v4.4 now.

This change tries to avoid the class initializers as much as
possible, by delaying the initialization of the empty array and
some fields' saved defaults until when they're needed. However,
if the message hosts any extensions, they must be public static
final and therefore introducing the class initializer. In that
case we won't bother with lazy initialization.

Change-Id: I00d8296f6eb0023112b93ee135cdb28dbd52b0b8
ava/src/main/java/com/google/protobuf/nano/InternalNano.java
ava/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_enum_field.h
rc/google/protobuf/compiler/javanano/javanano_field.cc
rc/google/protobuf/compiler/javanano/javanano_field.h
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.h
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.h
7c0eadd45cb4e0fef8afffe1626c2e4711418b49 10-Dec-2013 Max Cai <maxtroy@google.com> am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"

* commit '6a6b3b384c6084b3ce0de360b6dcb74a82bc23bb':
Nano: don't generate accessor methods for nested methods
6a6b3b384c6084b3ce0de360b6dcb74a82bc23bb 10-Dec-2013 Max Cai <maxtroy@google.com> am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"

* commit 'cea499acf68b35921b956785c26c0e6f18c241c1':
Nano: don't generate accessor methods for nested methods
cea499acf68b35921b956785c26c0e6f18c241c1 10-Dec-2013 Max Cai <maxtroy@google.com> Merge "Nano: don't generate accessor methods for nested methods"
102cfe65b9b9e2b458c3d0ec69d47e8fc40dc726 04-Dec-2013 Andrew Flynn <flynn@google.com> Nano: don't generate accessor methods for nested methods

For nested message objects, don't generate accessor methods because they have
a default value that is not a valid value (null), so there is no reason to have
get/set/has/clear methods for them. Clients and protos (while serializing) can
check against the invalid value to see if it's been set.

Change-Id: Ic63400889581271b8cbcd9c45c84519d4921fd4b
ava/README.txt
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.h
da929e3ea6310e7dc46745f191200afc489600e6 06-Dec-2013 The Android Open Source Project <initial-contribution@android.com> am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD

* commit '98c9208a616a97adf00bf1b3265e0f589c191d95':
98c9208a616a97adf00bf1b3265e0f589c191d95 06-Dec-2013 The Android Open Source Project <initial-contribution@android.com> am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD

* commit 'b6089cca5248f19832dde54faaad62891ff8bd25':
b6089cca5248f19832dde54faaad62891ff8bd25 05-Dec-2013 The Android Open Source Project <initial-contribution@android.com> Merge commit '0afd5a4d782037ea641d75d595cf5d38ed6978ac' into HEAD
6597e4f210be48b731e995c6c9950046ccf7689b 23-Nov-2013 The Android Open Source Project <initial-contribution@android.com> am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD

* commit '485b7645fea855d55b281185c7299ee9d7ab7f9a':
485b7645fea855d55b281185c7299ee9d7ab7f9a 23-Nov-2013 The Android Open Source Project <initial-contribution@android.com> am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD

* commit 'c4c4a562672068fb89ea4e65408dd53de2ed8f1f':
c4c4a562672068fb89ea4e65408dd53de2ed8f1f 22-Nov-2013 The Android Open Source Project <initial-contribution@android.com> Merge commit '7cb6b37f3799affce9e1be39977d4419283df795' into HEAD
b3ad7eaeb3233d9842a74e2252efa189d4c0524a 21-Nov-2013 Max Cai <maxtroy@google.com> am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."

* commit '0143d32d6ff0aad17873b486966c7a58efa04811':
Align with main: two ways of parsing repeated packable fields.
0143d32d6ff0aad17873b486966c7a58efa04811 21-Nov-2013 Max Cai <maxtroy@google.com> am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."

* commit 'f5271c9ca4a237221c0ba722dc548050ad131064':
Align with main: two ways of parsing repeated packable fields.
f5271c9ca4a237221c0ba722dc548050ad131064 18-Nov-2013 Max Cai <maxtroy@google.com> Merge "Align with main: two ways of parsing repeated packable fields."
fea3fd5cb6ff88b51da60b1f33004944d93a9fce 13-Nov-2013 Max Cai <maxtroy@google.com> Align with main: two ways of parsing repeated packable fields.

It is a requirement for parsing code to handle packed and unpacked
forms on the wire for repeated packable fields. This change aligns
the javanano's behavior with the java's.

Bonus: optimize array length calculation when parsing repeated
fixed-size-element-type fields.

Bonus 2: lose "xMemoizedSerializedSize" for repeated enum fields,
and make the serialized size calculation match that for repeated
int32 fields.

Change-Id: I8a06103d9290234adb46b0971b5ed155544fe86a
ava/README.txt
ava/pom.xml
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_enum_field.h
rc/google/protobuf/compiler/javanano/javanano_field.cc
rc/google/protobuf/compiler/javanano/javanano_field.h
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.h
rc/google/protobuf/unittest_repeated_packables_nano.proto
4115d56f3d03ca788a08a0a1eb6c79fa107550d3 15-Nov-2013 Max Cai <maxtroy@google.com> am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."

* commit '0afd5a4d782037ea641d75d595cf5d38ed6978ac':
Update MessageNano#toString() to return mostly valid TextFormat.
0afd5a4d782037ea641d75d595cf5d38ed6978ac 15-Nov-2013 Max Cai <maxtroy@google.com> am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."

* commit '3e0d99fab8c1da2a8f36637b7bf5e8581143e36a':
Update MessageNano#toString() to return mostly valid TextFormat.
3e0d99fab8c1da2a8f36637b7bf5e8581143e36a 15-Nov-2013 Max Cai <maxtroy@google.com> Merge "Update MessageNano#toString() to return mostly valid TextFormat."
62a22a732fb134e5f34dd3e01920933ca5b16346 10-Nov-2013 Nicholas Seckar <seckar@google.com> Update MessageNano#toString() to return mostly valid TextFormat.

The output of toString is now aligned with that used by non-nano and C++
runtimes, with the exception of groups. Groups should be serialized using a
camelized name (e.g. "FooBar" rather than "foo_bar") however the nano runtime
does not have information on which fields are groups.

Changes are:
- bytes fields are output within double-quotes, non-printable characters are
output as octal escape sequences (i.e. \NNN);
- field identifiers are output in underscored format;
- unset fields are not output (rather than printing "null");
- the type name of the root message is not output.

With these changes the nano toString, normal toString, and C++'s DebugString all
produce equivalent output when given the same message. (Provided that message
uses no deprecated features.)

Change-Id: Id4791d73822846db29344db9f7bc3781c3e183a6
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
ava/src/test/java/com/google/protobuf/NanoTest.java
139bd6ac80ca61f85796bded692eeb5bb932cfca 15-Nov-2013 Max Cai <maxtroy@google.com> am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."

* commit '382a066aa300b51cfd96c83ad53c49ce496d9d5c':
Fix warnings warnings in header files, hide others.
382a066aa300b51cfd96c83ad53c49ce496d9d5c 15-Nov-2013 Max Cai <maxtroy@google.com> am 332076f0: Merge "Fix warnings warnings in header files, hide others."

* commit '332076f08a9d46b772fee755832a0e09dd8cb6aa':
Fix warnings warnings in header files, hide others.
332076f08a9d46b772fee755832a0e09dd8cb6aa 15-Nov-2013 Max Cai <maxtroy@google.com> Merge "Fix warnings warnings in header files, hide others."
cd0ff6eb0b178cc1c3ed4300cd4066ea3a5c180b 13-Nov-2013 Kristian Monsen <kristianm@google.com> Fix warnings warnings in header files, hide others.

Follow upstream where they have any changes in 2.5.0

Change-Id: I3466e9c11242f533a9dff8c1afef4202dd100f2e
ndroid.mk
rc/google/protobuf/io/coded_stream.h
rc/google/protobuf/wire_format_lite_inl.h
b88c1729d89e76b06ae3b87d90cae6ea36cfde90 12-Nov-2013 Max Cai <maxtroy@google.com> am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."

* commit '77e9fbd32c2732063a479acb50143a388a2321f0':
Minimize method count for nanoproto.
77e9fbd32c2732063a479acb50143a388a2321f0 12-Nov-2013 Max Cai <maxtroy@google.com> am ac8e2e15: Merge "Minimize method count for nanoproto."

* commit 'ac8e2e150716784a707587ae6e2c8b3a291a2ae7':
Minimize method count for nanoproto.
ac8e2e150716784a707587ae6e2c8b3a291a2ae7 12-Nov-2013 Max Cai <maxtroy@google.com> Merge "Minimize method count for nanoproto."
7e02f374901ff471db5140f415de157ac6243050 11-Nov-2013 Tom Chao <chaot@google.com> Minimize method count for nanoproto.

- Migrates getCachedSize to the MessageNano parent class to save one method per message.
- Create ExtendableMessageNano parent class for protos with extensions, this saves the
getExtension and setExtension methods on the relevant messages.
- getSerializedSize's default case (with no fields to serialize) also migrate to the
parent class, which saves methods on empty messages.
- Container classes become interfaces to save the constructor.

Change-Id: I81f1a1b6d6a660096835e9df3ea20456655aab4a
ava/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
rc/google/protobuf/compiler/javanano/javanano_file.cc
rc/google/protobuf/compiler/javanano/javanano_message.cc
8eda9d3f991c62237a24e4d9f8e7f58df1687a86 07-Nov-2013 Max Cai <maxtroy@google.com> am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."

* commit '42b5c369cd0559025938d07c73ca51d1c0c32f2e':
Allow for ref-type arrays containing null elements.
42b5c369cd0559025938d07c73ca51d1c0c32f2e 07-Nov-2013 Max Cai <maxtroy@google.com> am 8a15121c: Merge "Allow for ref-type arrays containing null elements."

* commit '8a15121c1077fe883f428bd27dee6b99e06e48b6':
Allow for ref-type arrays containing null elements.
8a15121c1077fe883f428bd27dee6b99e06e48b6 06-Nov-2013 Max Cai <maxtroy@google.com> Merge "Allow for ref-type arrays containing null elements."
beb57e08a44a140bf52235717f1f907ca857f360 14-Aug-2013 Aurash Mahbod <aurash@google.com> Allow for ref-type arrays containing null elements.

Strip the null elements out before serializing the array.
This is helpful in the cases where the user wants to construct
an array of an inexact size for serialization. For example:
User constructs array of size 5 because they anticipate adding
more than 1 element before serialization. Only 3 get added, so
the array looks like [Obj, Obj, Obj, null, null]. This would
curently crash without this CL.

All repeated fields of ref-type elements can contain null
elements: repeated strings, repeated bytes, and repeated
messages/groups.

Change-Id: I117391c868c9a436536d70d6151780e9cc7e8227

Conflicts:
src/google/protobuf/compiler/javanano/javanano_message_field.cc
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
e2cbcf3853917c6ce1fcc0cbcc00b747db7798fe 25-Oct-2013 Max Cai <maxtroy@google.com> am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."

* commit '72fa49d45452418ca7365b97af9e7d426d535916':
Implement hashCode() and equals() behind a generator option.
72fa49d45452418ca7365b97af9e7d426d535916 25-Oct-2013 Max Cai <maxtroy@google.com> am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."

* commit 'bb971d53626cb286f8dc491c15d2731001c4891b':
Implement hashCode() and equals() behind a generator option.
bb971d53626cb286f8dc491c15d2731001c4891b 25-Oct-2013 Max Cai <maxtroy@google.com> Merge "Implement hashCode() and equals() behind a generator option."
ccc48faf20dbf3b3cddcffe78d198876d543529b 16-Oct-2013 Brian Duff <bduff@google.com> Implement hashCode() and equals() behind a generator option.

The option is only called 'generate_equals' because:
- equals() is the main thing; hashCode() is there only to
complement equals();
- it's shorter;
- toString() should not be included in this option because
it's more for debugging and it's more likely to stop
ProGuard from working well.

Also shortened the "has bit" expression; was
((bitField & mask) == mask), now ((bitField & mask) != 0).
Both the Java code and the bytecode are slightly shorter.

Change-Id: Ic309a08a60883bf454eb6612679aa99611620e76
ava/pom.xml
ava/src/main/java/com/google/protobuf/nano/InternalNano.java
ava/src/main/java/com/google/protobuf/nano/UnknownFieldData.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_enum_field.h
rc/google/protobuf/compiler/javanano/javanano_field.h
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.h
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_message.h
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.h
rc/google/protobuf/compiler/javanano/javanano_params.h
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.h
0610e6834fa213c026d91fab037a649613840f44 16-Oct-2013 Max Cai <maxtroy@google.com> am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"

* commit '7cb6b37f3799affce9e1be39977d4419283df795':
Feature request: set() and clear() accessors return this
7cb6b37f3799affce9e1be39977d4419283df795 16-Oct-2013 Max Cai <maxtroy@google.com> am 42be1e79: Merge "Feature request: set() and clear() accessors return this"

* commit '42be1e79ccd670be36220222936aa7cacc6856f6':
Feature request: set() and clear() accessors return this
42be1e79ccd670be36220222936aa7cacc6856f6 16-Oct-2013 Max Cai <maxtroy@google.com> Merge "Feature request: set() and clear() accessors return this"
b15a1b379f896e371ca3375bdf51dd4a9a0268af 16-Oct-2013 Max Cai <maxtroy@google.com> Feature request: set() and clear() accessors return this

Also pre-inlines set() and has() in serialization code. This could
theoretically help ProGuard: the message class size is usually large,
and because of this only, it may refuse to inline an accessor into
the serialization code, and as a result keeps the accessor intact.
Chances are, after pre-inlining all accessor calls within the message
class, those accessors become unused or single-use, so there are more
reasons for ProGuard to inline and then remove them.

Change-Id: I57decbe0b2533c1be21439de0aad15f49c7024dd
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
4b359335e94c44fa16b78c1406f3cd71b7fbf40b 16-Oct-2013 Max Cai <maxtroy@google.com> am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."

* commit 'd52f7a3e2f3d4dba9b8c134dc2fa2a54ddd1ce17':
Make generated code more aligned with Google Java style.
d52f7a3e2f3d4dba9b8c134dc2fa2a54ddd1ce17 16-Oct-2013 Max Cai <maxtroy@google.com> am c50f605c: Merge "Make generated code more aligned with Google Java style."

* commit 'c50f605c572a425b2fa696fedc5e61ac6f66d2a9':
Make generated code more aligned with Google Java style.
c50f605c572a425b2fa696fedc5e61ac6f66d2a9 16-Oct-2013 Max Cai <maxtroy@google.com> Merge "Make generated code more aligned with Google Java style."
286271f75aa6ff1f3746379b77d6dc55415baa16 14-Oct-2013 Max Cai <maxtroy@google.com> Make generated code more aligned with Google Java style.

- Blank line after opening a message class (but not an enum interface).
- Let all code blocks insert blank lines before themselves. This applies to
'package' statement, all message classes, enum classes or constant groups,
extensions, bitfields, proto fields (one block per field; i.e. accessors
don't have blank lines among them), and basic MessageNano methods. In this
case we don't need to guess what the next block is and create blank lines
for it.
- Fixed some newline/indent errors.
- Only one SuppressWarnings("hiding") per file.

Change-Id: I865f52ad4fb6ea3b3a98b97ac9d78d19fc46c858
rc/google/protobuf/compiler/javanano/javanano_enum.cc
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_extension.cc
rc/google/protobuf/compiler/javanano/javanano_file.cc
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
677d51bb86ca57654617dae9fe645995a1b22658 16-Oct-2013 Max Cai <maxtroy@google.com> am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."

* commit '5b4b84a18dc04b1b6c931c42403731fa79eb213d':
Fix repeated field merging semantics.
5b4b84a18dc04b1b6c931c42403731fa79eb213d 16-Oct-2013 Max Cai <maxtroy@google.com> am afaf74ce: Merge "Fix repeated field merging semantics."

* commit 'afaf74ce55f4aff63dc30e7045a7cd6c1cf232dc':
Fix repeated field merging semantics.
afaf74ce55f4aff63dc30e7045a7cd6c1cf232dc 16-Oct-2013 Max Cai <maxtroy@google.com> Merge "Fix repeated field merging semantics."
334a7d1117a576bc6010c14677fb6444639c1dda 15-Oct-2013 Max Cai <maxtroy@google.com> Fix repeated field merging semantics.

The public doc states that repeated fields are simply concatenated
and doesn't impose a different semantics for packed fields. This
CL fixes this for packed fields and adds tests covering all cases.

Also fixed a bit of missed null-repeated-field treatments.

Change-Id: Ie35277bb1a9f0b8171dc9d07b6adf9b9d3308de2
ava/pom.xml
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/unittest_repeated_merge_nano.proto
8f903e123aff94f272aaae22e275924980433a47 15-Oct-2013 Max Cai <maxtroy@google.com> am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."

* commit 'bf222b76dc346d3946a701ba675a7c31833f81fc':
Protect against null repeated fields.
bf222b76dc346d3946a701ba675a7c31833f81fc 15-Oct-2013 Max Cai <maxtroy@google.com> am 63e819ad: Merge "Protect against null repeated fields."

* commit '63e819adbb4d2d8215f5d3d8297dc50bf2fe3329':
Protect against null repeated fields.
63e819adbb4d2d8215f5d3d8297dc50bf2fe3329 15-Oct-2013 Max Cai <maxtroy@google.com> Merge "Protect against null repeated fields."
0e5add1dd4a5ce73ff10b38307bae942be178d5b 15-Oct-2013 Max Cai <maxtroy@google.com> am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge

* commit '051ea13ce26ff0ff9dbc487c2b233b0159204e40':
051ea13ce26ff0ff9dbc487c2b233b0159204e40 15-Oct-2013 Max Cai <maxtroy@google.com> am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge

* commit 'c85806baedfc98ad5759a990b35ea5b5f1ac4edb':
e03e9f4b5774c0ffe04140d83bbdb532863b1720 09-Oct-2013 Brian Duff <bduff@google.com> Protect against null repeated fields.

There's no distinction between a repeated field being null and being
empty. In both cases, nothing is sent on the wire. Clients might for
whatever reason inadvertently set a repeated field to null, so
protect against that and treat it just as if the field was empty.

Change-Id: Ic3846f7f2189d6cfff6f8ef3ca217daecc3c8be7
ava/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
ee8847c131e91c718a0f4d2af73ec56d9fd24d81 11-Oct-2013 Max Cai <maxtroy@google.com> am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."

* commit '145af9e8915a5e814d5deba8bcea68d066dd7f9e':
Remove all field initializers and let ctor call clear().
145af9e8915a5e814d5deba8bcea68d066dd7f9e 11-Oct-2013 Max Cai <maxtroy@google.com> am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."

* commit '39cee9f1f5cd513a53ac5100eb208ed431f99af0':
Remove all field initializers and let ctor call clear().
39cee9f1f5cd513a53ac5100eb208ed431f99af0 11-Oct-2013 Max Cai <maxtroy@google.com> Merge "Remove all field initializers and let ctor call clear()."
c85806baedfc98ad5759a990b35ea5b5f1ac4edb 11-Oct-2013 Max Cai <maxtroy@google.com> Merge remote-tracking branch 'goog/klp-dev-plus-aosp' into tomerge
5ae438cf71487d5bc8cb5c0d0e637f976734d110 11-Oct-2013 Max Cai <maxtroy@google.com> Remove all field initializers and let ctor call clear().

The field initializers have basically caused the compiled <init> method
to inline the whole clear() method, which means if ProGuard is not used
or failed to inline or remove clear(), there are two big chunks of code
that do the same thing. So why not just call clear() from the ctor.

Change-Id: Ief71e2b03db2e059b3bfa98309649368089ffab0
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
dc8f4a8bc871cf1ba6a27eaf7f581a144571411a 10-Oct-2013 Ulas Kirazci <ulas@google.com> am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"

* commit '7457ebc9ae3eee30ccb44f259a14316e7d9ab950':
Add missing README parts for enum_style and in-repo usage
7457ebc9ae3eee30ccb44f259a14316e7d9ab950 10-Oct-2013 Ulas Kirazci <ulas@google.com> am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"

* commit 'cbb08132821cb56f4e6c5e5f8a0b32f51879782a':
Add missing README parts for enum_style and in-repo usage
cbb08132821cb56f4e6c5e5f8a0b32f51879782a 10-Oct-2013 Ulas Kirazci <ulas@google.com> Merge "Add missing README parts for enum_style and in-repo usage"
d91cb18cc224be53379fc083b37452a094307933 10-Oct-2013 Max Cai <maxtroy@google.com> Add missing README parts for enum_style and in-repo usage

Change-Id: I7934a5b0444017aeda787501ebf8d9f9ba295c73
ava/README.txt
ca07ad9d617b3ebab5d66077413bdfc7673a2926 09-Oct-2013 Ulas Kirazci <ulas@google.com> am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."

* commit '570db0e9bdfb7c2696dcd6c31483223cc2d1c4f3':
Add reftypes field generator option.
570db0e9bdfb7c2696dcd6c31483223cc2d1c4f3 09-Oct-2013 Ulas Kirazci <ulas@google.com> am c4a1b547: Merge "Add reftypes field generator option."

* commit 'c4a1b547c91178d79f5d2cc2e00b8be922c22fe8':
Add reftypes field generator option.
c4a1b547c91178d79f5d2cc2e00b8be922c22fe8 09-Oct-2013 Ulas Kirazci <ulas@google.com> Merge "Add reftypes field generator option."
d6be7db044050f9941ff7b7a3e57af0565d4e53c 09-Oct-2013 Wink Saville <wink@google.com> am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"

* commit 'fdbd1e42d8fdfde0efc3ed3d31f0ee95f5e324ac':
Fix some indenting issues with set__() function
fdbd1e42d8fdfde0efc3ed3d31f0ee95f5e324ac 09-Oct-2013 Wink Saville <wink@google.com> am 44cbb06c: Merge "Fix some indenting issues with set__() function"

* commit '44cbb06c725fbba00464bba9f19dc0ea295406b1':
Fix some indenting issues with set__() function
44cbb06c725fbba00464bba9f19dc0ea295406b1 09-Oct-2013 Wink Saville <wink@google.com> Merge "Fix some indenting issues with set__() function"
5dca493053aa93bdd2b5dba842ad87d34ba31521 08-Oct-2013 Andrew Flynn <flynn@google.com> Fix some indenting issues with set__() function

Previously it looked like this:

public final class OuterClass {
[...]
public static final class InnerClass extends
com.google.protobuf.nano.MessageNano {
[...]
public void setId(java.lang.String value) {
if (value == null) {
throw new java.lang.NullPointerException();
}
id_ = value;
bitfield0_ |= 0x00000001;
[...]
}
[...]
}

Now it looks like this:

public final class OuterClass {
[...]
public static final class InnerClass extends
com.google.protobuf.nano.MessageNano {
[...]
public void setId(java.lang.String value) {
if (value == null) throw new java.lang.NullPointerException();
id_ = value;
bitfield0_ |= 0x00000001;
[...]
}
[...]
}

Change-Id: I2a9289b528f785c846210d558206d677aa13e9be
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
0b8579237336f221711a0aac42400eb31a58fed3 01-Oct-2013 Brian Duff <bduff@google.com> Add reftypes field generator option.

This option generates fields as reference types, and serializes
based on nullness.

Change-Id: Ic32e0eebff59d14016cc9a19e15a9bb08ae0bba5
Signed-off-by: Brian Duff <bduff@google.com>
ava/README.txt
ava/pom.xml
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_params.h
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/unittest_reference_types_nano.proto
5f8ef51529f07ae758ec4944759828a1414dbb7c 04-Oct-2013 Ulas Kirazci <ulas@google.com> am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."

* commit '0255eb04c74f86b9bd482d65331d6d8bb4eb3d18':
Fix roundtrip failure with groups when unknown fields are enabled.
0255eb04c74f86b9bd482d65331d6d8bb4eb3d18 04-Oct-2013 Ulas Kirazci <ulas@google.com> am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."

* commit '9827c718c45cfa1744a3b0f8fc27dac9cd415603':
Fix roundtrip failure with groups when unknown fields are enabled.
9827c718c45cfa1744a3b0f8fc27dac9cd415603 04-Oct-2013 Ulas Kirazci <ulas@google.com> Merge "Fix roundtrip failure with groups when unknown fields are enabled."
37ac79028de3d1cd8c215ba54fdf31e4eeca4b2c 25-Sep-2013 Nicholas Seckar <seckar@google.com> Fix roundtrip failure with groups when unknown fields are enabled.

When parsing a group, the group's end tag should not be stored within the
message's unknownFieldData. Not only does this waste space, it is also output
the next time the group is serialized, resulting in two end tags for that group.
The resulting bytes are not always a valid protocol buffer and may fail to
parse.

This change ensures that group end tags do not result in an unknownFieldData
entry, and that messages with groups can be roundtripped without corruption.

Change-Id: I240f858a7217a7652b756598c34aacad5dcc3363

Conflicts:
java/src/test/java/com/google/protobuf/NanoTest.java
ava/src/main/java/com/google/protobuf/nano/WireFormatNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/unittest_extension_nano.proto
c1f9ebcefb026a84e369347ddc23a3e4c6e9c940 29-Sep-2013 Ulas Kirazci <ulas@google.com> am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."

* commit '8f93f123e2597ba9c02c2792abe180e63a0d9d5b':
Implement enum_style=java option.
c017bb8c147d30641b36e6d16b9133c0dd9e8453 29-Sep-2013 Ulas Kirazci <ulas@google.com> am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."

* commit '3f85c84042611b1f412a73023da8dcd9858037c3':
Accessor style for optional fields.
8f93f123e2597ba9c02c2792abe180e63a0d9d5b 29-Sep-2013 Ulas Kirazci <ulas@google.com> am 44dc2f1e: Merge "Implement enum_style=java option."

* commit '44dc2f1eaead8d95d3f5a4f80f9da87852053bfb':
Implement enum_style=java option.
3f85c84042611b1f412a73023da8dcd9858037c3 29-Sep-2013 Ulas Kirazci <ulas@google.com> am 0d035e9b: Merge "Accessor style for optional fields."

* commit '0d035e9b3485d26df106ff9118705d8476466674':
Accessor style for optional fields.
44dc2f1eaead8d95d3f5a4f80f9da87852053bfb 29-Sep-2013 Ulas Kirazci <ulas@google.com> Merge "Implement enum_style=java option."
0d035e9b3485d26df106ff9118705d8476466674 29-Sep-2013 Ulas Kirazci <ulas@google.com> Merge "Accessor style for optional fields."
26266cd4660ffe1f3d6015b715713ee654c5b936 24-Sep-2013 Max Cai <maxtroy@google.com> Implement enum_style=java option.

This javanano_out command line option creates a container interface
at the normal place where the enum constants would reside, per enum
definition. The java_multiple_files flag would now affect the file-
scope enums with the shells. If the flag is true then file-scope
container interfaces are created in their own files.

Change-Id: Id52258fcff8d3dee9db8f3d8022147a811bf3565
ava/README.txt
ava/pom.xml
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_enum.cc
rc/google/protobuf/compiler/javanano/javanano_file.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/unittest_enum_class_multiple_nano.proto
rc/google/protobuf/unittest_enum_class_nano.proto
6778e0a0198f602cab76daf6428a97292007dc71 24-Sep-2013 Ulas Kirazci <ulas@google.com> am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"

* commit '2923f3d2d87c1acd41df5fa741d51c2bbafbd640':
Add some bitfield helper methods from 2.4
2923f3d2d87c1acd41df5fa741d51c2bbafbd640 24-Sep-2013 Ulas Kirazci <ulas@google.com> am cc652daa: Merge "Add some bitfield helper methods from 2.4"

* commit 'cc652daaec7fc6ebf8b12d361444364da257988b':
Add some bitfield helper methods from 2.4
cc652daaec7fc6ebf8b12d361444364da257988b 24-Sep-2013 Ulas Kirazci <ulas@google.com> Merge "Add some bitfield helper methods from 2.4"
bbda8b10152bbdb7d6057724f0e3e197db9ec108 24-Sep-2013 Ulas Kirazci <ulas@google.com> am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."

* commit '081ac0fc81819ad6d124d4133e6d2e4037ca9c5b':
Add two codegen parameters to nano.
081ac0fc81819ad6d124d4133e6d2e4037ca9c5b 24-Sep-2013 Ulas Kirazci <ulas@google.com> am 9e6afdf9: Merge "Add two codegen parameters to nano."

* commit '9e6afdf96f98259f89aad66367954a247b3e7817':
Add two codegen parameters to nano.
9e6afdf96f98259f89aad66367954a247b3e7817 24-Sep-2013 Ulas Kirazci <ulas@google.com> Merge "Add two codegen parameters to nano."
e74fe623e115237968a3de1143d7cdb4df710858 20-Sep-2013 Max Cai <maxtroy@google.com> Accessor style for optional fields.

This CL implements the 'optional_field_style=accessors' option.
All optional fields will now be 1 Java field and 1 bit in a shared
bitfield behind get/set/has/clear accessor methods. The setter
performs null check for reference types (Strings and byte[]s).

Also decentralized the clear code generation.

Change-Id: I60ac78329e352e76c2f8139fba1f292383080ad3
ava/README.txt
ava/pom.xml
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_enum_field.h
rc/google/protobuf/compiler/javanano/javanano_field.cc
rc/google/protobuf/compiler/javanano/javanano_field.h
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.h
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.h
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.h
rc/google/protobuf/unittest_accessors_nano.proto
47dee56155c7bdb9855e51ff08c99db306d11a2d 18-Sep-2013 Max Cai <maxtroy@google.com> Add some bitfield helper methods from 2.4

Change-Id: Ib9bb549602f71a451d2107fb04de17877553860e
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.h
26ce449901aa8c2f954fb4a5e8bbcc1253b3ca01 18-Sep-2013 Max Cai <maxtroy@google.com> Add two codegen parameters to nano.

enum_style = c | java: 'c' to put the enum member int constants
at the parent scope; 'java' to create uninstantiatable shell
classes at the parent scope and put the int constants inside.

optional_field_style = default | accessors: 'default' to create
one public mutable field per optional proto field; 'accessors'
to encapsulate the generated fields behind get, set, has and
clear accessors.

This CL only contains parsing code for these two parameters.

Change-Id: Iec0c3b0f30af8eb7db328e790664306bc90be089
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_params.h
380d1b5a78de07a081b36c890321ac61a0fced1a 14-Aug-2013 Adam Metcalf <gamblore@google.com> Fix the merge conflict leftovers.

Change-Id: I8738e69df79d7bee3fb06b57cbc9e67414a27261
uild.gradle
adfb09a08d450f356a69c74c0a80a3e4573e20b8 13-Aug-2013 Wink Saville <wink@google.com> am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc

* commit '7632e0ad04851ea5524a9f52504e7dcdbc00c514':
Add a Gradle build file for the protobuf libraries.
7632e0ad04851ea5524a9f52504e7dcdbc00c514 13-Aug-2013 Wink Saville <wink@google.com> Merge commit '11c3b27d' into fix-mc

* commit '11c3b27d':
Add a Gradle build file for the protobuf libraries.

Change-Id: Id785093c51eb423576292994a98d42efbbc3fddb
11c3b27da0b81064b745d4e11ba54d9ce592d318 13-Aug-2013 Wink Saville <wink@google.com> Merge "Add a Gradle build file for the protobuf libraries."
df9a6dffee90f5ff657265b415ee5eb9fb5e3960 09-Aug-2013 Wink Saville <wink@google.com> am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit '48ee66d295979372ed0234cefda42385daae8312':
ba363f1380e9b99e6606462b21febd2e4027e340 09-Aug-2013 Wink Saville <wink@google.com> am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."

* commit 'a38aedb3fff651a4e1921162d88df3e1c75726b3':
48ee66d295979372ed0234cefda42385daae8312 09-Aug-2013 Wink Saville <wink@google.com> am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit 'ece98e5f6728a937c8d32d342f3b1b037a611f3e':
Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto.
a38aedb3fff651a4e1921162d88df3e1c75726b3 09-Aug-2013 Wink Saville <wink@google.com> am e7b778b9: Merge "Fix outer classname for javamicro/javanano."

* commit 'e7b778b99f607460ed9ea88a13ec91164cda8537':
Fix outer classname for javamicro/javanano.
57faa14e5c5b678b38dcae1288f3e5eb34bd819f 08-Aug-2013 Adam Metcalf <gamblore@google.com> Add a Gradle build file for the protobuf libraries.

Has two configurations: micro and nano.

Change-Id: I009f956e11cf13694738743a757438ebf181b340
uild.gradle
4d7f9ad71771fff628e88d463af94b44457b7934 08-Aug-2013 Wink Saville <wink@google.com> am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."

* commit 'ece98e5f6728a937c8d32d342f3b1b037a611f3e':
Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto.
f105476adedac50be509ed36cbb187b92fca54d9 08-Aug-2013 Wink Saville <wink@google.com> am e7b778b9: Merge "Fix outer classname for javamicro/javanano."

* commit 'e7b778b99f607460ed9ea88a13ec91164cda8537':
Fix outer classname for javamicro/javanano.
ece98e5f6728a937c8d32d342f3b1b037a611f3e 08-Aug-2013 Wink Saville <wink@google.com> Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
d1229a35f127eb85391797f04aed1b9fe7da9fd8 08-Aug-2013 Wink Saville <wink@google.com> Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto.

Change-Id: I2dad2fd9f6c3d419fa77cf8162cd1ee49f74cc5d
ndroid.mk
e7b778b99f607460ed9ea88a13ec91164cda8537 07-Aug-2013 Wink Saville <wink@google.com> Merge "Fix outer classname for javamicro/javanano."
624c448fbef20a1a2fad2289f622b468c25763d1 29-Jul-2013 Max Cai <maxtroy@google.com> Fix outer classname for javamicro/javanano.

- File class name is defined as the java_outer_classname option value
or the file name ToCamelCase; never the single message's ClassName.
- File-scope enums are translated to constants in the file class,
regardless of java_multiple_files.
- If java_multiple_files=true, and file's class name equals a message's
class name, no error. This is done by detecting that the outer class
is not needed and skipping the outer class codegen and clash checks.
Note: there is a disparity between java[lite] and the previous
java{micr|nan}o: when generating code for a single-message proto, the
outer class is omitted by java{micr|nan}o if the file does not have
java_outer_classname. This change makes java{micr|nan}o align with
java[lite] codegen and create the outer class, but will print some
info to warn of potential change of code.
- Also fixed the "is_own_file" detection and made all parseX() methods
static. Previously, all messages in a java_multiple_files=true file
are (incorrectly) considered to be in their own files, including
nested messages, causing them to become inner classes (instance-
bound) and forcing the parseX() methods to lose the static modifier.
- This change supersedes c/60164 and c/60086, which causes javanano to
put enum values into enum shell classes if java_multiple_files=true.
We now always use the parent class to host the enum values. A future
change will add a command line option to provide more flexibility.
- Elaborated in java/README.txt.

Change-Id: I684932f90e0a028ef37c662b221def5ffa202439
ava/README.txt
ava/pom.xml
ava/src/test/java/com/google/protobuf/MicroTest.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javamicro/javamicro_file.cc
rc/google/protobuf/compiler/javamicro/javamicro_generator.cc
rc/google/protobuf/compiler/javamicro/javamicro_helpers.cc
rc/google/protobuf/compiler/javamicro/javamicro_helpers.h
rc/google/protobuf/compiler/javamicro/javamicro_message.cc
rc/google/protobuf/compiler/javanano/javanano_enum.cc
rc/google/protobuf/compiler/javanano/javanano_file.cc
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.h
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/unittest_enum_multiplejava_nano.proto
rc/google/protobuf/unittest_multiple_micro.proto
rc/google/protobuf/unittest_multiple_nameclash_micro.proto
rc/google/protobuf/unittest_multiple_nameclash_nano.proto
rc/google/protobuf/unittest_multiple_nano.proto
rc/google/protobuf/unittest_recursive_micro.proto
rc/google/protobuf/unittest_recursive_nano.proto
rc/google/protobuf/unittest_simple_micro.proto
rc/google/protobuf/unittest_simple_nano.proto
rc/google/protobuf/unittest_single_micro.proto
rc/google/protobuf/unittest_single_nano.proto
rc/google/protobuf/unittest_stringutf8_micro.proto
rc/google/protobuf/unittest_stringutf8_nano.proto
d55a408122072b779e4c27c6ba59c138b5613895 01-Aug-2013 Ulas Kirazci <ulas@google.com> am 87c8e31b: Merge "Fixed packed repeated serialization."

* commit '87c8e31b8c0baa78f979863a9ed10654a1cdca1f':
Fixed packed repeated serialization.
87c8e31b8c0baa78f979863a9ed10654a1cdca1f 01-Aug-2013 Ulas Kirazci <ulas@google.com> Merge "Fixed packed repeated serialization."
14dd1f02ac95f61087e311bf61c85047fb218a29 29-Jul-2013 Ulas Kirazci <ulas@google.com> Fixed packed repeated serialization.

Remove buggy memoization. Memoization also is too fragile for the api
because the repeated field is public.

Change-Id: I538b8426d274b22df2eeea5935023abbe7df49fe
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.h
ac2b5234ba6d9eec446e7cf487932f5c4d2a1137 29-Jul-2013 Ulas Kirazci <ulas@google.com> am be47f55e: Merge "Add an option to inspect "has" state upon parse."

* commit 'be47f55e2f93df84abb55759e49cf381d2745cc5':
Add an option to inspect "has" state upon parse.
be47f55e2f93df84abb55759e49cf381d2745cc5 29-Jul-2013 Ulas Kirazci <ulas@google.com> Merge "Add an option to inspect "has" state upon parse."
35d9fd84ff1d9ecdb91156b757cc9fdcc3f25249 01-Apr-2013 Ulas Kirazci <ulas@google.com> Add an option to inspect "has" state upon parse.

If has is set, also always serialize.

Change-Id: I2c8450f7ab9e837d722123dd1042991c0258ede3
ava/README.txt
ava/pom.xml
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_params.h
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.h
rc/google/protobuf/unittest_has_nano.proto
2df62a831bad2aa6eb57826c37b2b5c46c577e0d 26-Jul-2013 Ulas Kirazci <ulas@google.com> am 021f8f1b: Merge "Add test for passing in proto params."

* commit '021f8f1badf1c4db519e3f35d600dec4b5c52eff':
Add test for passing in proto params.
021f8f1badf1c4db519e3f35d600dec4b5c52eff 26-Jul-2013 Ulas Kirazci <ulas@google.com> Merge "Add test for passing in proto params."
669802cc412f1889c6709932745eafb6d7d0be39 26-Jul-2013 Ulas Kirazci <ulas@google.com> am ac5a239e: Merge "Per-file java_multiple_files flag."

* commit 'ac5a239e7d90613cb9404098b70c036a52531a74':
Per-file java_multiple_files flag.
ac5a239e7d90613cb9404098b70c036a52531a74 26-Jul-2013 Ulas Kirazci <ulas@google.com> Merge "Per-file java_multiple_files flag."
7e567b8b0a9e1155666752723ca835734d60ab92 24-Jul-2013 Ulas Kirazci <ulas@google.com> Add test for passing in proto params.

Depends on Ia532647fe8811d39230a23ba3671685b0388cbe0

Change-Id: I0ba3ce3561aff31e246968a79b1d1053dec91d49
ndroid.mk
ava/README.txt
8170787391efcb6cc6a8babc1cce35d5b1aff420 24-Jul-2013 Max Cai <maxtroy@google.com> Per-file java_multiple_files flag.

Imported source files may have different values for the 'java_multiple_files'
option to the main source file's. Whether the fully qualified Java name of an
entity should include the outer class name depends on the flag value in the
file defining the referenced entity, not the main file. This CL loads the
flag values from the main and all transitively imported files into the params,
and generates the fully qualified Java names accordingly.

If the generator option 'java_multiple_files' is set, its value overrides any
in-file values in all source/imported files. This is because this generator
option is typically used on either none or all source files.

Change-Id: Id6a4a42426d68961dc669487d38f35530deb7d8e
ava/pom.xml
ava/src/test/java/com/google/protobuf/MicroTest.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javamicro/javamicro_file.cc
rc/google/protobuf/compiler/javamicro/javamicro_generator.cc
rc/google/protobuf/compiler/javamicro/javamicro_helpers.cc
rc/google/protobuf/compiler/javamicro/javamicro_message.cc
rc/google/protobuf/compiler/javamicro/javamicro_params.h
rc/google/protobuf/compiler/javanano/javanano_enum.cc
rc/google/protobuf/compiler/javanano/javanano_file.cc
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_params.h
rc/google/protobuf/unittest_multiple_micro.proto
rc/google/protobuf/unittest_multiple_nano.proto
0356bf3f22e08f4f7d9391334115f7a7766ff969 23-Jul-2013 Ulas Kirazci <ulas@google.com> am 3099f911: am 19c4090e: Merge "Allow NaN/+inf/-inf defaults in micro/nano."

* commit '3099f911382d143d9b702d36e5e52d2f37d8edd9':
Allow NaN/+inf/-inf defaults in micro/nano.
3099f911382d143d9b702d36e5e52d2f37d8edd9 23-Jul-2013 Ulas Kirazci <ulas@google.com> am 19c4090e: Merge "Allow NaN/+inf/-inf defaults in micro/nano."

* commit '19c4090eddf0eb4d65d1b41f283368c5e0f615a1':
Allow NaN/+inf/-inf defaults in micro/nano.
19c4090eddf0eb4d65d1b41f283368c5e0f615a1 23-Jul-2013 Ulas Kirazci <ulas@google.com> Merge "Allow NaN/+inf/-inf defaults in micro/nano."
0f2ca89132ab81441f7eb351c7a053a8c8d9d1c3 22-Jul-2013 Chris Smith <cjs@google.com> Allow NaN/+inf/-inf defaults in micro/nano.

Adds support for default values of NaN, infinity and negative
infinity for floats and doubles in both the nano and micro
java compiler.

Change-Id: Ibc43e5ebb073e51d9a8181f3aa23b72e10015dca
ava/src/test/java/com/google/protobuf/MicroTest.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javamicro/javamicro_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/unittest_micro.proto
rc/google/protobuf/unittest_nano.proto
283fc71424dc4b2aabf462cf9ff0ba35cdc37294 20-Jul-2013 Ulas Kirazci <ulas@google.com> am f604f71a: am a400007e: Merge "Add contribution instructions for nano."

* commit 'f604f71aed9bb28f1bf06875272797b24da1dd66':
Add contribution instructions for nano.
f604f71aed9bb28f1bf06875272797b24da1dd66 20-Jul-2013 Ulas Kirazci <ulas@google.com> am a400007e: Merge "Add contribution instructions for nano."

* commit 'a400007ed570bbcc638c05c59727b3527238ec70':
Add contribution instructions for nano.
a400007ed570bbcc638c05c59727b3527238ec70 20-Jul-2013 Ulas Kirazci <ulas@google.com> Merge "Add contribution instructions for nano."
3fc971c672b976c1e311e4fd9ae0b40aaf54fc37 19-Jul-2013 Ulas Kirazci <ulas@google.com> am 4c18ce2d: am aad4b307: Merge "Update nano to serialize java keywords properly."

* commit '4c18ce2df954bc6e75b164fd008797e92beed7e1':
Update nano to serialize java keywords properly.
231b8989fdd91147a3f097ce454a8a7a23782ac4 19-Jul-2013 Ulas Kirazci <ulas@google.com> Add contribution instructions for nano.

Change-Id: Ie110d182a84258ab5bb3ba1f67c6ada6be476c7e
ava/README.txt
4c18ce2df954bc6e75b164fd008797e92beed7e1 19-Jul-2013 Ulas Kirazci <ulas@google.com> am aad4b307: Merge "Update nano to serialize java keywords properly."

* commit 'aad4b3074456fb1acec6e64596d5c18d716ac146':
Update nano to serialize java keywords properly.
aad4b3074456fb1acec6e64596d5c18d716ac146 19-Jul-2013 Ulas Kirazci <ulas@google.com> Merge "Update nano to serialize java keywords properly."
f4e01452f159ae6b53f5edd25fa647ca2919ae10 18-Jul-2013 Tom Chao <chaot@google.com> Update nano to serialize java keywords properly.

Change-Id: I7407d0fab609c336ecd73499e725aed0dd50f555
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_enum.cc
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_extension.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.h
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/unittest_nano.proto
9db9e1e9146b6b59a9c6cfca15c9c80b537ac81e 16-Jul-2013 Adam Metcalf <gamblore@google.com> Added micro/nano configurations to protobuf in gradle.

Change-Id: I7655fafcb4ca3bd6e090d7fd549eda2eb989bfcf
uild.gradle
8a87cde979be8c858b290b62d27783ad239c98f4 11-Jul-2013 Ulas Kirazci <ulas@google.com> am 67b43035: am 8cf17a8f: Merge "Make it possible to use MessageNano.mergeFrom without casting."

* commit '67b4303516bb01e485aa9bad9d2f372c4b2844a3':
Make it possible to use MessageNano.mergeFrom without casting.
898da1a0236f67b9344527d6befe17a0062bf6f2 11-Jul-2013 Ulas Kirazci <ulas@google.com> am 7bb086c8: am eda87c5c: Merge "Fix vanilla make build."

* commit '7bb086c897ce5ba7d5053d6b112f7b9d37e3ae72':
Fix vanilla make build.
ed60c0dc59d20f788f9bcc4cf40ba5a8fe2ee616 11-Jul-2013 Wink Saville <wink@google.com> am 08891725: am 728a8b78: Merge "Fix the build"

* commit '088917256bbdd7f28d20ed8f5abb2e723b68f4de':
Fix the build
67b4303516bb01e485aa9bad9d2f372c4b2844a3 09-Jul-2013 Ulas Kirazci <ulas@google.com> am 8cf17a8f: Merge "Make it possible to use MessageNano.mergeFrom without casting."

* commit '8cf17a8fbab128bda57c573e2ef7e0fafea39269':
Make it possible to use MessageNano.mergeFrom without casting.
8cf17a8fbab128bda57c573e2ef7e0fafea39269 09-Jul-2013 Ulas Kirazci <ulas@google.com> Merge "Make it possible to use MessageNano.mergeFrom without casting."
7bb086c897ce5ba7d5053d6b112f7b9d37e3ae72 09-Jul-2013 Ulas Kirazci <ulas@google.com> am eda87c5c: Merge "Fix vanilla make build."

* commit 'eda87c5cad8cf84768bcb31d4762c6ec35a6b87d':
Fix vanilla make build.
eda87c5cad8cf84768bcb31d4762c6ec35a6b87d 09-Jul-2013 Ulas Kirazci <ulas@google.com> Merge "Fix vanilla make build."
37168637d1b1ad9aa0c11c0c254c4de9bfa16b1d 09-Jul-2013 Ulas Kirazci <ulas@google.com> Fix vanilla make build.

Nano extension sources were missing.

Change-Id: Ic3278edae2db5e41e5aa2e7d58e0daa8e29f20b7
rc/Makefile.am
rc/Makefile.in
088917256bbdd7f28d20ed8f5abb2e723b68f4de 09-Jul-2013 Wink Saville <wink@google.com> am 728a8b78: Merge "Fix the build"

* commit '728a8b78917ded5ea0f3f9c331810aedcb5353f9':
Fix the build
728a8b78917ded5ea0f3f9c331810aedcb5353f9 09-Jul-2013 Wink Saville <wink@google.com> Merge "Fix the build"
4ce58c2aa66ee2900f14c90cdf874cf27cc81756 09-Jul-2013 Evan Charlton <evanc@google.com> Fix the build

javanano_extension needed to be added to the Makefile.{am,in} in
addition to the Android.mk file.

Change-Id: I8b917fd72d1dec13e64b3c3d13bd204c83f31402
rc/Makefile.am
rc/Makefile.in
19641419a381509bddfc2d0b5d60a411b67b105b 29-Jun-2013 Brian Duff <bduff@google.com> Make it possible to use MessageNano.mergeFrom without casting.

You can now do:

MyMessage foo = MessageNano.mergeFrom(new MyMessage(), bytes);

without having to cast the message returned from mergeFrom.

Change-Id: Ibb2ad327f75855d45352ad304c7f054f20dd29c9
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_message.cc
a05b79d1d2ccab8862a6adbd3295a1b6d73758a9 26-Jun-2013 Wink Saville <wink@google.com> am d1b8322f: am 0a1429cc: Merge "Nano support for extensions and unknown fields."

* commit 'd1b8322fccad8946d3b32dda9f75048865a94209':
Nano support for extensions and unknown fields.
d1b8322fccad8946d3b32dda9f75048865a94209 25-Jun-2013 Wink Saville <wink@google.com> am 0a1429cc: Merge "Nano support for extensions and unknown fields."

* commit '0a1429cc5ee4865550bcdddfae681a30cef58a5a':
Nano support for extensions and unknown fields.
0a1429cc5ee4865550bcdddfae681a30cef58a5a 25-Jun-2013 Wink Saville <wink@google.com> Merge "Nano support for extensions and unknown fields."
0e055f079f53b07de3705838a7b4742ce56839f8 19-Jun-2013 Brian Duff <bduff@google.com> Nano support for extensions and unknown fields.

You can use the processor option store_unknown_fields to switch
this support on:

aprotoc --javanano_out=store_unknown_fields=true:/tmp/out

A separate option for extensions isn't required. Support
for unknown fields must be turned on to allow storing and
retrieving extensions, because they are just stored as
unknown fields. If unknown fields are switched on, extension
related code will be generated when a proto message includes
an extension range, or an extension is encountered.

By default, store_unknown_fields is false. No additional
code is generated, and the generator will error out if protos
contain extension ranges or extensions.

Change-Id: I1e034c9e8f3305612953f72438189a7da6ed2167
ndroid.mk
ava/pom.xml
ava/src/main/java/com/google/protobuf/nano/CodedInputByteBufferNano.java
ava/src/main/java/com/google/protobuf/nano/Extension.java
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/main/java/com/google/protobuf/nano/UnknownFieldData.java
ava/src/main/java/com/google/protobuf/nano/WireFormatNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/google/protobuf/compiler/javanano/javanano_extension.cc
rc/google/protobuf/compiler/javanano/javanano_extension.h
rc/google/protobuf/compiler/javanano/javanano_file.cc
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_params.h
rc/google/protobuf/unittest_extension_nano.proto
98bbe8a394916aa5238c1c87c1617ad3ad17a763 14-Jun-2013 Adam Metcalf <gamblore@google.com> Gradle project file.

Adds a gradle project file so that other projects can use the
:micro and :nano libraries.

Change-Id: I7e5aeb584acd11d39e57bf9d4ecfc3af175ffbb2
uild.gradle
8ac37341ac169e99bc8e45fff614c60fee40e33a 07-Jun-2013 Wink Saville <wink@google.com> am 9459b5c4: Merge "Fix enum field references with java_multiple_files."

* commit '9459b5c45b0ad33bea9376c2afb66cf93da610ac':
Fix enum field references with java_multiple_files.
9459b5c45b0ad33bea9376c2afb66cf93da610ac 07-Jun-2013 Wink Saville <wink@google.com> Merge "Fix enum field references with java_multiple_files."
bf79e2de36143b8b617af136c403496515373bb6 07-Jun-2013 Brian Duff <bduff@google.com> 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
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/unittest_enum_multiplejava_nano.proto
3c46a5260aba2b42a1a4b2399168dd155d37c52f 07-Jun-2013 Wink Saville <wink@google.com> am 6f59b383: Merge "Add toString() method to MessageNano."

* commit '6f59b38386c8ff883c8e9e0a76068fa07d95bfb1':
Add toString() method to MessageNano.
6f59b38386c8ff883c8e9e0a76068fa07d95bfb1 07-Jun-2013 Wink Saville <wink@google.com> Merge "Add toString() method to MessageNano."
8aa0ec508ffca005f22a4e06e5dbd9d9fee8c138 06-Jun-2013 Wink Saville <wink@google.com> 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.
4e76e72b03f6dafc9ad650864b6a12b665801b9b 06-Jun-2013 Wink Saville <wink@google.com> Merge "Fix javanano compiler generating uncompileable java code. This happened for enums when java_multiple_files=true."
0eca14248fc14a12c5c8a6fc253bef6f58cc60c1 05-Jun-2013 Brian Duff <bduff@google.com> Fix javanano compiler generating uncompileable java code. This happened
for enums when java_multiple_files=true.

Change-Id: Ia6fe1a51c6a46eb9a2f29527829794076b165cb7
Signed-off-by: Brian Duff <bduff@google.com>
ava/pom.xml
rc/google/protobuf/compiler/javanano/javanano_enum.cc
rc/google/protobuf/unittest_enum_multiplejava_nano.proto
47107914acbad70ff4db1664d3664ccc994315af 29-May-2013 Andrew Flynn <flynn@google.com> Add toString() method to MessageNano.

- 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
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
ava/src/test/java/com/google/protobuf/NanoTest.java
d3aac45875dbfe714f3aa13cf245d213ac8177c7 30-Apr-2013 Wink Saville <wink@google.com> am d29f87c7: Merge "Fix typos in protobuf readme."

* commit 'd29f87c79f34ecd6b7889cc49ca9e9d90c413634':
Fix typos in protobuf readme.
d29f87c79f34ecd6b7889cc49ca9e9d90c413634 30-Apr-2013 Wink Saville <wink@google.com> Merge "Fix typos in protobuf readme."
6a02a45d8425376695b417bf0d6c46dbab8a700c 27-Apr-2013 Matt Thrailkill <mthrailkill@google.com> Fix typos in protobuf readme.

Change-Id: Ifa3c8674482ae9575df459a3e76e9f8b4a9296b5
Signed-off-by: Matt Thrailkill <mthrailkill@google.com>
ava/README.txt
d8c7eb8cee21a56b8d5021a7705271d3ecf4bf2d 09-Apr-2013 Ficus Kirkpatrick <ficus@android.com> am e0ee97ea: Merge "Don\'t use Arrays.copyOf in generated code."

* commit 'e0ee97eaac9a0f3d74c42315a109cdc25f2fddc0':
Don't use Arrays.copyOf in generated code.
e0ee97eaac9a0f3d74c42315a109cdc25f2fddc0 09-Apr-2013 Ficus Kirkpatrick <ficus@android.com> Merge "Don't use Arrays.copyOf in generated code."
710ca66fdd31db8f3920b122292bdc3250d5aada 08-Apr-2013 Ficus Kirkpatrick <ficus@android.com> 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
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
1a76d851d077e72f4407a630027f3cc2579f88e0 04-Apr-2013 Wink Saville <wink@google.com> am a6b79eb9: Merge "Prevent conflicts between local and proto variable names."

* commit 'a6b79eb9618fc1774aa18a0b365e48398f23808a':
Prevent conflicts between local and proto variable names.
5aa725374346bbfa0d5dd867d2e8450044ce13f7 04-Apr-2013 Ulas Kirazci <ulas@google.com> am fb8f78fe: Prevent conflicts between local and proto variable names.

* commit 'fb8f78fe6e2d757b813747d5d401a0eeb0cd478b':
Prevent conflicts between local and proto variable names.
fb8f78fe6e2d757b813747d5d401a0eeb0cd478b 04-Apr-2013 Ulas Kirazci <ulas@google.com> Prevent conflicts between local and proto variable names.

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

Change-Id: I5f07d3252fc385c4174d9165b64785b40f676e17
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_enum_field.h
rc/google/protobuf/compiler/javanano/javanano_field.h
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.h
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.h
rc/google/protobuf/unittest_nano.proto
a6b79eb9618fc1774aa18a0b365e48398f23808a 04-Apr-2013 Wink Saville <wink@google.com> Merge "Prevent conflicts between local and proto variable names."
0f1c4eb967517e21701a3b425d115baff5d15b4f 04-Apr-2013 Ulas Kirazci <ulas@google.com> Prevent conflicts between local and proto variable names.

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

Change-Id: I5f07d3252fc385c4174d9165b64785b40f676e17
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_enum_field.h
rc/google/protobuf/compiler/javanano/javanano_field.h
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.h
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.h
rc/google/protobuf/unittest_nano.proto
3280d9871215c22c07aa78185317c3a3123c2152 03-Apr-2013 Ulas Kirazci <ulas@google.com> am 43325653: Nano protobufs.

* commit '43325653beb4e5b6923d0380a84bf7e204be5c22':
Nano protobufs.
43325653beb4e5b6923d0380a84bf7e204be5c22 15-Mar-2013 Ulas Kirazci <ulas@google.com> 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
ndroid.mk
akefile.in
clocal.m4
onfig.h.in
onfigure
test/Makefile.in
test/aclocal.m4
test/build-aux/config.h.in
test/build-aux/ltmain.sh
test/configure
ava/README.txt
ava/pom.xml
ava/src/main/java/com/google/protobuf/nano/CodedInputByteBufferNano.java
ava/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java
ava/src/main/java/com/google/protobuf/nano/InternalNano.java
ava/src/main/java/com/google/protobuf/nano/InvalidProtocolBufferNanoException.java
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/main/java/com/google/protobuf/nano/WireFormatNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/Makefile.am
rc/Makefile.in
rc/google/protobuf/compiler/javanano/javanano_enum.cc
rc/google/protobuf/compiler/javanano/javanano_enum.h
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_enum_field.h
rc/google/protobuf/compiler/javanano/javanano_field.cc
rc/google/protobuf/compiler/javanano/javanano_field.h
rc/google/protobuf/compiler/javanano/javanano_file.cc
rc/google/protobuf/compiler/javanano/javanano_file.h
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_generator.h
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.h
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_message.h
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.h
rc/google/protobuf/compiler/javanano/javanano_params.h
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.h
rc/google/protobuf/compiler/main.cc
rc/google/protobuf/unittest_import_nano.proto
rc/google/protobuf/unittest_nano.proto
rc/google/protobuf/unittest_recursive_nano.proto
rc/google/protobuf/unittest_simple_nano.proto
rc/google/protobuf/unittest_stringutf8_nano.proto
b296a1e50943209b62ab96043eca698281d98a28 02-Apr-2013 Wink Saville <wink@google.com> am 216c9e86: Merge "Nano protobufs."

* commit '216c9e8681b9426e84c9e2222da5c0dd669261b2':
Nano protobufs.
216c9e8681b9426e84c9e2222da5c0dd669261b2 02-Apr-2013 Wink Saville <wink@google.com> Merge "Nano protobufs."
64d8d8f89050c5ada85341f967af391f4716a7cb 15-Mar-2013 Ulas Kirazci <ulas@google.com> 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
ndroid.mk
akefile.in
clocal.m4
onfig.h.in
onfigure
test/Makefile.in
test/aclocal.m4
test/build-aux/config.h.in
test/build-aux/ltmain.sh
test/configure
ava/README.txt
ava/pom.xml
ava/src/main/java/com/google/protobuf/nano/CodedInputByteBufferNano.java
ava/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java
ava/src/main/java/com/google/protobuf/nano/InternalNano.java
ava/src/main/java/com/google/protobuf/nano/InvalidProtocolBufferNanoException.java
ava/src/main/java/com/google/protobuf/nano/MessageNano.java
ava/src/main/java/com/google/protobuf/nano/WireFormatNano.java
ava/src/test/java/com/google/protobuf/NanoTest.java
rc/Makefile.am
rc/Makefile.in
rc/google/protobuf/compiler/javanano/javanano_enum.cc
rc/google/protobuf/compiler/javanano/javanano_enum.h
rc/google/protobuf/compiler/javanano/javanano_enum_field.cc
rc/google/protobuf/compiler/javanano/javanano_enum_field.h
rc/google/protobuf/compiler/javanano/javanano_field.cc
rc/google/protobuf/compiler/javanano/javanano_field.h
rc/google/protobuf/compiler/javanano/javanano_file.cc
rc/google/protobuf/compiler/javanano/javanano_file.h
rc/google/protobuf/compiler/javanano/javanano_generator.cc
rc/google/protobuf/compiler/javanano/javanano_generator.h
rc/google/protobuf/compiler/javanano/javanano_helpers.cc
rc/google/protobuf/compiler/javanano/javanano_helpers.h
rc/google/protobuf/compiler/javanano/javanano_message.cc
rc/google/protobuf/compiler/javanano/javanano_message.h
rc/google/protobuf/compiler/javanano/javanano_message_field.cc
rc/google/protobuf/compiler/javanano/javanano_message_field.h
rc/google/protobuf/compiler/javanano/javanano_params.h
rc/google/protobuf/compiler/javanano/javanano_primitive_field.cc
rc/google/protobuf/compiler/javanano/javanano_primitive_field.h
rc/google/protobuf/compiler/main.cc
rc/google/protobuf/unittest_import_nano.proto
rc/google/protobuf/unittest_nano.proto
rc/google/protobuf/unittest_recursive_nano.proto
rc/google/protobuf/unittest_simple_nano.proto
rc/google/protobuf/unittest_stringutf8_nano.proto
adeccdc18128424a6879bc45b60be90a2e0ca104 15-Dec-2012 Ying Wang <wangying@google.com> am db9ab02c: (-s ours) Build against the NDK for x86 and mips too.

* commit 'db9ab02c090cdc5d2b31399867a4052351b8793d':
Build against the NDK for x86 and mips too.
db9ab02c090cdc5d2b31399867a4052351b8793d 06-Sep-2012 Ying Wang <wangying@google.com> Build against the NDK for x86 and mips too.

Change-Id: I68963dc1c274c3dcf1038d4e21dc418f9554b78f
ndroid.mk
a939d667261041b51bfa2cc746d0f6c3b6a66207 06-Nov-2012 Przemyslaw Szczepaniak <pszczepaniak@google.com> Add gnustl+rtti version of cpp full library

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
ndroid.mk
082bf44e4b6c03be4970d461912d1d74adbb4cff 06-Sep-2012 Ying Wang <wangying@google.com> Build against the NDK for x86 and mips too.

Change-Id: I68963dc1c274c3dcf1038d4e21dc418f9554b78f
ndroid.mk
0e637a107438c37fff84cc89a79ba9fd1bed4a26 14-Aug-2012 Ying Wang <wangying@google.com> am a6d94785: Retire LOCAL_NDK_VERSION.

* commit 'a6d94785fc7c80c33de99b5a65e6a5e3a2e93fb3':
Retire LOCAL_NDK_VERSION.
a6d94785fc7c80c33de99b5a65e6a5e3a2e93fb3 14-Aug-2012 Ying Wang <wangying@google.com> Retire LOCAL_NDK_VERSION.

Bug: 6932421
Change-Id: Ieaad80daf4e6a4a7f058dd242f37a144e8ee9e76
ndroid.mk
f6da580c598ac3718d65487eed1f08003ff27fd5 14-Aug-2012 Ying Wang <wangying@google.com> Retire LOCAL_NDK_VERSION.

Bug: 6932421
Change-Id: Ieaad80daf4e6a4a7f058dd242f37a144e8ee9e76
ndroid.mk
589f591841e40d6d0b6e0115a3c9f0f8055889cb 31-Jul-2012 The Android Open Source Project <initial-contribution@android.com> No-op - skip bad commit

Change-Id: I8cda9afd9b0c85953145135563ef4fb3a0bbb743
10f0f318de1a7f4a9151b9838bec62700e4c9b21 30-Jul-2012 Chad Jones <chadj@google.com> Initial empty repository
25b5a76155860b450c1176684f8e6007aab8aa7b 27-Jun-2012 Andy Stadler <stadler@google.com> Generate "modern" java to reduce warnings

* @SuppressWarnings("hiding") for field names that are reused in inner
classes.
* @Override for methods defined in com.google.protobuf.micro.MessageMicro
* Removed unnecessary type casting
* Only throw exception from writeTo when there are fields to write.

This removes over 1,000 warnings from the Play client.

Change-Id: I9049c94f1e6aec5e5547898defc03c8d379c3c10
rc/google/protobuf/compiler/javamicro/javamicro_message.cc
77f19bf165314eb40918e43154f5047e7be8fb27 15-Jun-2012 Ying Wang <wangying@google.com> Build the target protobuf libraries against the NDK

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

Change-Id: Ic4948f27395b2c2b81ea120d9e2353ba9aad02a8
ndroid.mk
6b42a64f2e36e5a34b99a5c3054658ccf9735b39 11-Jun-2012 Wink Saville <wink@google.com> When computing Group and Message size use getSerializedSize.

Bug: 6589939
Change-Id: I3050a99b08edf48301314163d41ea6f8080ffcdb
ava/src/main/java/com/google/protobuf/micro/CodedOutputStreamMicro.java
e217977611c52bccde7f7c78e1d3c790c6357431 12-Jul-2011 Jeff Brown <jeffbrown@google.com> Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: I9a5e66066482aa0007f221bb866ac57f4eb1b70c
ndroid.mk
8a2f7578bb6289415f1d0a01c9cc96d283730480 21-Jun-2011 Wink Saville <wink@google.com> Fix bug in skipRawBytes if request is larger than buffer.

Original solution by Scott Barta this change adds tests
and also fixes the same bug that was in CodedInputStream.

Change-Id: Idb49691822b3f292c5092edc52db4e153e9da49a
ava/src/main/java/com/google/protobuf/CodedInputStream.java
ava/src/main/java/com/google/protobuf/micro/CodedInputStreamMicro.java
ava/src/test/java/com/google/protobuf/CodedInputStreamTest.java
ava/src/test/java/com/google/protobuf/MicroTest.java
9fdd84ae4554a30d2a986a9b3ada9300296e4870 08-Feb-2011 Ying Wang <wangying@google.com> am 7cc5f59e: Unbundle protobuffer target libraries.

* commit '7cc5f59ec79718040bb1efd8be2ed12af2de5e1a':
Unbundle protobuffer target libraries.
7cc5f59ec79718040bb1efd8be2ed12af2de5e1a 26-Jan-2011 Ying Wang <wangying@google.com> Unbundle protobuffer target libraries.

Change-Id: I3047d2cd10828844562fa57ae3b619fe919c6113
ndroid.mk
770e6591f648204d810002aed27d0f818f9641d7 26-Jan-2011 Ying Wang <wangying@google.com> Unbundle protobuffer target libraries.

Change-Id: I535f93389b3b13578c9602dce3d38f1ca256e807
ndroid.mk
8d24c6add5f0a6640948afccd9976b64a04a8ed3 05-Nov-2010 Wink Saville <wink@google.com> Rename protoc to aprotoc.

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
ndroid.mk
aeb2b2a40e2d1c2e210a2f4d29e534fd6ef29be4 01-Nov-2010 Iain Merrick <husky@google.com> Build the protocol buffer compiler 'protoc'.

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

Change-Id: Ic7a78273ee4f066680039d2f724e658a84869621
ndroid.mk
9875374d1865894e2254adf781c54e040f75d635 07-Oct-2010 Wink Saville <wink@google.com> am 3574de1c: Remove vestigial references to StringUtf8Micro.

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

* commit '3574de1ca8301e1e13d1c89f2e2a902499d6bae9':
Remove vestigial references to StringUtf8Micro.
3574de1ca8301e1e13d1c89f2e2a902499d6bae9 06-Oct-2010 Wink Saville <wink@google.com> Remove vestigial references to StringUtf8Micro.

Change-Id: Ica75231b03de4768c671bf046b92bd7630ecd5c8
ava/README.txt
ava/src/test/java/com/google/protobuf/MicroTest.java
aa645be0632f4d75ab92120bf81ead2bbd30f8f7 06-Oct-2010 Jean-Baptiste Queru <jbq@google.com> merge from gingerbread

Change-Id: Id43a6262c3f5cffc37db77748f129acb9c841823
b854f4d90094e0e0b3b63b199fd9c26279d77245 05-Oct-2010 Jean-Baptiste Queru <jbq@google.com> Make these modules optional.

This allows compiling this code in Gingerbread.

Bug: 3064326

Change-Id: Idab78a5a31a3c2fc35bcdb773aaecf1e4fb70bcb
ndroid.mk
373caa091181f70951688e5b34eafd3bcac96716 01-Oct-2010 Omari Stephens <xsdg@android.com> Make protobuf usable by host-side java apps

Change-Id: Ic214bfb361eb2167d301b55a34b209a84a6d4a08
ndroid.mk
fdcaf07a13de696b42edbf2cf1b98e61052be8ce 16-Aug-2010 Wink Saville <wink@google.com> Add some python generated file/dirs to external/protobuf/.gitignore.

Change-Id: If22801f80a9bfe0fa5905e07894ec4b07f6db23b
gitignore
732aaf0089505130cea55633bcfb2fdf5111f380 29-Jun-2010 Wink Saville <wink@google.com> Add libprotobuf-cpp-2.3.0-full.

Add full c++ version of libprotobuf as a static library.

Change-Id: I153bc913ff51e6a904284b733cac000497e1caac
ndroid.mk
1b639e09d77de609bed080f5d2ca88d72ba42559 08-Jun-2010 Wink Saville <wink@google.com> Changed speed optimization for strings.

Removed use of StringUtf8Micro and instead use an extra byte array
instance variable directly in the class. This allows the list returned
for repeated strings to be a String instead of a StringUtf8Micro
making the class compatible with existing code.

Removed PerfTimer.java which isn't used.

Change-Id: Ie6acfb40f98f59a48c1a795d86f715078f9611f5
ava/pom.xml
ava/src/main/java/com/google/protobuf/micro/CodedOutputStreamMicro.java
ava/src/main/java/com/google/protobuf/micro/StringUtf8Micro.java
ava/src/test/java/com/google/protobuf/PerfTimer.java
rc/google/protobuf/compiler/javamicro/javamicro_primitive_field.cc
a3d3079a7ea18b2c052842272949247b7b4601e9 05-Jun-2010 Wink Saville <wink@google.com> Add libprotobuf-java-2.3.0-lite.

Also, have all the libraries follow the same naming convention so
rename com.google.protobuf.micro library to libprotobuf-java-2.3.0-micro.

Change-Id: I7c2a7d883a17f9a6d084ce4cac9601e344e416bf
ndroid.mk
5ea4d5824c2de3b0e838f838d4513e9f4dcd7d00 04-Jun-2010 Kenny Root <kroot@google.com> Skip stlport for simulator

The host's stl library conflicts with stlport, so we need to exclude
stlport from inclusion in the build if we're targeting the simulator.

Change-Id: Ib4da6140f4b8abb271d8e67636ccec2a796c8c5a
ndroid.mk
92006e8ce53aee4c55c9befde0a78e3709420583 04-Jun-2010 Wink Saville <wink@google.com> Merge "Add libprotobuf-cpp-2.3.0-lite"
b3fe74bb7067581371f487b12112b62ef8e66b9e 04-Jun-2010 Wink Saville <wink@google.com> Add libprotobuf-cpp-2.3.0-lite

Added android/config.h which will be used to configure
android builds of libraries. Currently I've undef HAVE_HASH_MAP
and HAVE_HASH_SET as the versions in stlport generated compile
errors.

Updated .gitignore to be more selective on what it ignores so
android/config.h wouldn't be ignored.

Change-Id: I53f3636121db2c6017491a37998b816aaf0cab5d
gitignore
ndroid.mk
ndroid/config.h
66663e974c1d66250e51f5008bce5590464bbe9a 03-Jun-2010 Wink Saville <wink@google.com> Fix bug in generating enum class name.

I was not properly constructing the enum class name if
there was a period in the protobuf package name.

Change-Id: I71e51d9745702fa89841ad714282afe8b42a3425
rc/google/protobuf/compiler/javamicro/javamicro_helpers.cc
e2d542951c059563a3b7f74c257dac4f222d9dc5 29-May-2010 Wink Saville <wink@google.com> Add support for Java micro protobuf's to protobuf-2.3.0.

See README.android for additional information.

Change-Id: I6693e405c0d651eacacd3227a876129865dd0d3c
ava/README.txt
ava/pom.xml
ava/src/main/java/com/google/protobuf/micro/ByteStringMicro.java
ava/src/main/java/com/google/protobuf/micro/CodedInputStreamMicro.java
ava/src/main/java/com/google/protobuf/micro/CodedOutputStreamMicro.java
ava/src/main/java/com/google/protobuf/micro/InvalidProtocolBufferMicroException.java
ava/src/main/java/com/google/protobuf/micro/MessageMicro.java
ava/src/main/java/com/google/protobuf/micro/StringUtf8Micro.java
ava/src/main/java/com/google/protobuf/micro/WireFormatMicro.java
ava/src/test/java/com/google/protobuf/MicroTest.java
ava/src/test/java/com/google/protobuf/PerfTimer.java
rc/Makefile.am
rc/Makefile.in
rc/google/protobuf/compiler/javamicro/javamicro_enum.cc
rc/google/protobuf/compiler/javamicro/javamicro_enum.h
rc/google/protobuf/compiler/javamicro/javamicro_enum_field.cc
rc/google/protobuf/compiler/javamicro/javamicro_enum_field.h
rc/google/protobuf/compiler/javamicro/javamicro_field.cc
rc/google/protobuf/compiler/javamicro/javamicro_field.h
rc/google/protobuf/compiler/javamicro/javamicro_file.cc
rc/google/protobuf/compiler/javamicro/javamicro_file.h
rc/google/protobuf/compiler/javamicro/javamicro_generator.cc
rc/google/protobuf/compiler/javamicro/javamicro_generator.h
rc/google/protobuf/compiler/javamicro/javamicro_helpers.cc
rc/google/protobuf/compiler/javamicro/javamicro_helpers.h
rc/google/protobuf/compiler/javamicro/javamicro_message.cc
rc/google/protobuf/compiler/javamicro/javamicro_message.h
rc/google/protobuf/compiler/javamicro/javamicro_message_field.cc
rc/google/protobuf/compiler/javamicro/javamicro_message_field.h
rc/google/protobuf/compiler/javamicro/javamicro_params.h
rc/google/protobuf/compiler/javamicro/javamicro_primitive_field.cc
rc/google/protobuf/compiler/javamicro/javamicro_primitive_field.h
rc/google/protobuf/compiler/main.cc
rc/google/protobuf/unittest_import_micro.proto
rc/google/protobuf/unittest_micro.proto
rc/google/protobuf/unittest_recursive_micro.proto
rc/google/protobuf/unittest_simple_micro.proto
rc/google/protobuf/unittest_stringutf8_micro.proto
d0332953cda33fb4f8e24ebff9c49159b69c43d6 29-May-2010 Wink Saville <wink@google.com> Add protobuf 2.3.0 sources

This is the contents of protobuf-2.3.0.tar.bz2 from
http://code.google.com/p/protobuf/downloads/list.

Change-Id: Idfde09ce7ef5ac027b07ee83f2674fbbed5c30b2
gitignore
HANGES.txt
ONTRIBUTORS.txt
akefile.am
akefile.in
utogen.sh
onfig.h.in
onfigure
onfigure.ac
ditors/protobuf-mode.el
enerate_descriptor_proto.sh
test/CHANGES
test/CONTRIBUTORS
test/Makefile.am
test/Makefile.in
test/README
test/configure
test/configure.ac
test/include/gtest/gtest-death-test.h
test/include/gtest/gtest-spi.h
test/include/gtest/gtest-test-part.h
test/include/gtest/gtest.h
test/include/gtest/internal/gtest-death-test-internal.h
test/include/gtest/internal/gtest-internal.h
test/include/gtest/internal/gtest-param-util-generated.h
test/include/gtest/internal/gtest-param-util-generated.h.pump
test/include/gtest/internal/gtest-param-util.h
test/include/gtest/internal/gtest-port.h
test/include/gtest/internal/gtest-string.h
test/msvc/gtest-md.sln
test/msvc/gtest-md.vcproj
test/msvc/gtest.sln
test/msvc/gtest.vcproj
test/msvc/gtest_color_test_.vcproj
test/msvc/gtest_env_var_test_.vcproj
test/msvc/gtest_environment_test.vcproj
test/msvc/gtest_main-md.vcproj
test/msvc/gtest_main.vcproj
test/msvc/gtest_output_test_.vcproj
test/msvc/gtest_prod_test-md.vcproj
test/msvc/gtest_prod_test.vcproj
test/msvc/gtest_uninitialized_test_.vcproj
test/msvc/gtest_unittest-md.vcproj
test/msvc/gtest_unittest.vcproj
test/samples/sample10_unittest.cc
test/samples/sample9_unittest.cc
test/scons/SConscript
test/scons/SConstruct
test/scons/SConstruct.common
test/scripts/gen_gtest_pred_impl.py
test/src/gtest-death-test.cc
test/src/gtest-filepath.cc
test/src/gtest-internal-inl.h
test/src/gtest-port.cc
test/src/gtest-test-part.cc
test/src/gtest.cc
test/test/gtest-death-test_test.cc
test/test/gtest-filepath_test.cc
test/test/gtest-listener_test.cc
test/test/gtest-options_test.cc
test/test/gtest-port_test.cc
test/test/gtest-test-part_test.cc
test/test/gtest-typed-test_test.cc
test/test/gtest-unittest-api_test.cc
test/test/gtest_env_var_test.py
test/test/gtest_filter_unittest_.cc
test/test/gtest_repeat_test.cc
test/test/gtest_shuffle_test.py
test/test/gtest_shuffle_test_.cc
test/test/gtest_stress_test.cc
test/test/gtest_unittest.cc
test/test/gtest_xml_output_unittest.py
test/test/gtest_xml_output_unittest_.cc
test/test/gtest_xml_test_utils.py
test/xcode/Config/FrameworkTarget.xcconfig
test/xcode/Config/InternalPythonTestTarget.xcconfig
test/xcode/Config/InternalTestTarget.xcconfig
test/xcode/Config/StaticLibraryTarget.xcconfig
test/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
test/xcode/Scripts/runtests.sh
test/xcode/gtest.xcodeproj/project.pbxproj
ava/README.txt
ava/pom.xml
ava/src/main/java/com/google/protobuf/AbstractMessage.java
ava/src/main/java/com/google/protobuf/AbstractMessageLite.java
ava/src/main/java/com/google/protobuf/ByteString.java
ava/src/main/java/com/google/protobuf/CodedInputStream.java
ava/src/main/java/com/google/protobuf/CodedOutputStream.java
ava/src/main/java/com/google/protobuf/Descriptors.java
ava/src/main/java/com/google/protobuf/ExtensionRegistry.java
ava/src/main/java/com/google/protobuf/GeneratedMessage.java
ava/src/main/java/com/google/protobuf/GeneratedMessageLite.java
ava/src/main/java/com/google/protobuf/Message.java
ava/src/main/java/com/google/protobuf/MessageLite.java
ava/src/main/java/com/google/protobuf/RpcCallback.java
ava/src/main/java/com/google/protobuf/RpcChannel.java
ava/src/main/java/com/google/protobuf/RpcController.java
ava/src/main/java/com/google/protobuf/Service.java
ava/src/main/java/com/google/protobuf/TextFormat.java
ava/src/main/java/com/google/protobuf/UnknownFieldSet.java
ava/src/main/java/com/google/protobuf/WireFormat.java
ava/src/main/java/com/google/protobuf/micro/ByteStringMicro.java
ava/src/main/java/com/google/protobuf/micro/CodedInputStreamMicro.java
ava/src/main/java/com/google/protobuf/micro/CodedOutputStreamMicro.java
ava/src/main/java/com/google/protobuf/micro/InvalidProtocolBufferMicroException.java
ava/src/main/java/com/google/protobuf/micro/MessageMicro.java
ava/src/main/java/com/google/protobuf/micro/StringUtf8Micro.java
ava/src/main/java/com/google/protobuf/micro/WireFormatMicro.java
ava/src/test/java/com/google/protobuf/AbstractMessageTest.java
ava/src/test/java/com/google/protobuf/CodedInputStreamTest.java
ava/src/test/java/com/google/protobuf/DescriptorsTest.java
ava/src/test/java/com/google/protobuf/GeneratedMessageTest.java
ava/src/test/java/com/google/protobuf/LiteTest.java
ava/src/test/java/com/google/protobuf/MicroTest.java
ava/src/test/java/com/google/protobuf/PerfTimer.java
ava/src/test/java/com/google/protobuf/ServiceTest.java
ava/src/test/java/com/google/protobuf/TestUtil.java
ava/src/test/java/com/google/protobuf/TextFormatTest.java
ava/src/test/java/com/google/protobuf/WireFormatTest.java
4/acx_check_suncc.m4
4/stl_hash.m4
ython/google/protobuf/descriptor.py
ython/google/protobuf/internal/containers.py
ython/google/protobuf/internal/decoder.py
ython/google/protobuf/internal/decoder_test.py
ython/google/protobuf/internal/descriptor_test.py
ython/google/protobuf/internal/encoder.py
ython/google/protobuf/internal/encoder_test.py
ython/google/protobuf/internal/generator_test.py
ython/google/protobuf/internal/input_stream.py
ython/google/protobuf/internal/input_stream_test.py
ython/google/protobuf/internal/message_listener.py
ython/google/protobuf/internal/message_test.py
ython/google/protobuf/internal/output_stream.py
ython/google/protobuf/internal/output_stream_test.py
ython/google/protobuf/internal/reflection_test.py
ython/google/protobuf/internal/test_util.py
ython/google/protobuf/internal/text_format_test.py
ython/google/protobuf/internal/type_checkers.py
ython/google/protobuf/internal/wire_format.py
ython/google/protobuf/message.py
ython/google/protobuf/reflection.py
ython/google/protobuf/service.py
ython/google/protobuf/text_format.py
ython/setup.py
rc/Makefile.am
rc/Makefile.in
rc/google/protobuf/compiler/code_generator.cc
rc/google/protobuf/compiler/code_generator.h
rc/google/protobuf/compiler/command_line_interface.cc
rc/google/protobuf/compiler/command_line_interface.h
rc/google/protobuf/compiler/command_line_interface_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_enum.cc
rc/google/protobuf/compiler/cpp/cpp_enum_field.cc
rc/google/protobuf/compiler/cpp/cpp_enum_field.h
rc/google/protobuf/compiler/cpp/cpp_extension.cc
rc/google/protobuf/compiler/cpp/cpp_field.cc
rc/google/protobuf/compiler/cpp/cpp_field.h
rc/google/protobuf/compiler/cpp/cpp_file.cc
rc/google/protobuf/compiler/cpp/cpp_helpers.cc
rc/google/protobuf/compiler/cpp/cpp_helpers.h
rc/google/protobuf/compiler/cpp/cpp_message.cc
rc/google/protobuf/compiler/cpp/cpp_message.h
rc/google/protobuf/compiler/cpp/cpp_message_field.cc
rc/google/protobuf/compiler/cpp/cpp_plugin_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_primitive_field.cc
rc/google/protobuf/compiler/cpp/cpp_primitive_field.h
rc/google/protobuf/compiler/cpp/cpp_string_field.cc
rc/google/protobuf/compiler/cpp/cpp_unittest.cc
rc/google/protobuf/compiler/importer.cc
rc/google/protobuf/compiler/java/java_enum.cc
rc/google/protobuf/compiler/java/java_enum_field.cc
rc/google/protobuf/compiler/java/java_enum_field.h
rc/google/protobuf/compiler/java/java_extension.cc
rc/google/protobuf/compiler/java/java_field.cc
rc/google/protobuf/compiler/java/java_field.h
rc/google/protobuf/compiler/java/java_file.cc
rc/google/protobuf/compiler/java/java_file.h
rc/google/protobuf/compiler/java/java_generator.cc
rc/google/protobuf/compiler/java/java_helpers.cc
rc/google/protobuf/compiler/java/java_helpers.h
rc/google/protobuf/compiler/java/java_message.cc
rc/google/protobuf/compiler/java/java_message_field.cc
rc/google/protobuf/compiler/java/java_message_field.h
rc/google/protobuf/compiler/java/java_plugin_unittest.cc
rc/google/protobuf/compiler/java/java_primitive_field.cc
rc/google/protobuf/compiler/java/java_primitive_field.h
rc/google/protobuf/compiler/javamicro/javamicro_enum.cc
rc/google/protobuf/compiler/javamicro/javamicro_enum.h
rc/google/protobuf/compiler/javamicro/javamicro_enum_field.cc
rc/google/protobuf/compiler/javamicro/javamicro_enum_field.h
rc/google/protobuf/compiler/javamicro/javamicro_field.cc
rc/google/protobuf/compiler/javamicro/javamicro_field.h
rc/google/protobuf/compiler/javamicro/javamicro_file.cc
rc/google/protobuf/compiler/javamicro/javamicro_file.h
rc/google/protobuf/compiler/javamicro/javamicro_generator.cc
rc/google/protobuf/compiler/javamicro/javamicro_generator.h
rc/google/protobuf/compiler/javamicro/javamicro_helpers.cc
rc/google/protobuf/compiler/javamicro/javamicro_helpers.h
rc/google/protobuf/compiler/javamicro/javamicro_message.cc
rc/google/protobuf/compiler/javamicro/javamicro_message.h
rc/google/protobuf/compiler/javamicro/javamicro_message_field.cc
rc/google/protobuf/compiler/javamicro/javamicro_message_field.h
rc/google/protobuf/compiler/javamicro/javamicro_params.h
rc/google/protobuf/compiler/javamicro/javamicro_primitive_field.cc
rc/google/protobuf/compiler/javamicro/javamicro_primitive_field.h
rc/google/protobuf/compiler/main.cc
rc/google/protobuf/compiler/mock_code_generator.cc
rc/google/protobuf/compiler/mock_code_generator.h
rc/google/protobuf/compiler/parser.cc
rc/google/protobuf/compiler/parser_unittest.cc
rc/google/protobuf/compiler/plugin.cc
rc/google/protobuf/compiler/plugin.h
rc/google/protobuf/compiler/plugin.pb.cc
rc/google/protobuf/compiler/plugin.pb.h
rc/google/protobuf/compiler/plugin.proto
rc/google/protobuf/compiler/python/python_generator.cc
rc/google/protobuf/compiler/python/python_generator.h
rc/google/protobuf/compiler/python/python_plugin_unittest.cc
rc/google/protobuf/compiler/subprocess.cc
rc/google/protobuf/compiler/subprocess.h
rc/google/protobuf/compiler/test_plugin.cc
rc/google/protobuf/compiler/zip_output_unittest.sh
rc/google/protobuf/compiler/zip_writer.cc
rc/google/protobuf/compiler/zip_writer.h
rc/google/protobuf/descriptor.cc
rc/google/protobuf/descriptor.h
rc/google/protobuf/descriptor.pb.cc
rc/google/protobuf/descriptor.pb.h
rc/google/protobuf/descriptor.proto
rc/google/protobuf/descriptor_database.cc
rc/google/protobuf/descriptor_database.h
rc/google/protobuf/descriptor_database_unittest.cc
rc/google/protobuf/descriptor_unittest.cc
rc/google/protobuf/dynamic_message.cc
rc/google/protobuf/dynamic_message.h
rc/google/protobuf/extension_set.cc
rc/google/protobuf/extension_set.h
rc/google/protobuf/extension_set_heavy.cc
rc/google/protobuf/extension_set_unittest.cc
rc/google/protobuf/generated_message_reflection.cc
rc/google/protobuf/generated_message_reflection.h
rc/google/protobuf/generated_message_util.cc
rc/google/protobuf/generated_message_util.h
rc/google/protobuf/io/coded_stream.cc
rc/google/protobuf/io/coded_stream.h
rc/google/protobuf/io/coded_stream_inl.h
rc/google/protobuf/io/coded_stream_unittest.cc
rc/google/protobuf/io/printer.cc
rc/google/protobuf/io/printer.h
rc/google/protobuf/io/printer_unittest.cc
rc/google/protobuf/io/tokenizer.cc
rc/google/protobuf/io/tokenizer.h
rc/google/protobuf/io/tokenizer_unittest.cc
rc/google/protobuf/io/zero_copy_stream_impl.h
rc/google/protobuf/io/zero_copy_stream_unittest.cc
rc/google/protobuf/message.cc
rc/google/protobuf/message.h
rc/google/protobuf/message_lite.cc
rc/google/protobuf/message_unittest.cc
rc/google/protobuf/repeated_field.cc
rc/google/protobuf/repeated_field.h
rc/google/protobuf/repeated_field_unittest.cc
rc/google/protobuf/service.h
rc/google/protobuf/stubs/common.h
rc/google/protobuf/stubs/hash.h
rc/google/protobuf/stubs/once.cc
rc/google/protobuf/stubs/once.h
rc/google/protobuf/stubs/once_unittest.cc
rc/google/protobuf/stubs/structurally_valid.cc
rc/google/protobuf/stubs/structurally_valid_unittest.cc
rc/google/protobuf/stubs/strutil.cc
rc/google/protobuf/stubs/strutil.h
rc/google/protobuf/test_util.cc
rc/google/protobuf/test_util.h
rc/google/protobuf/testing/file.cc
rc/google/protobuf/testing/googletest.cc
rc/google/protobuf/text_format.cc
rc/google/protobuf/text_format.h
rc/google/protobuf/text_format_unittest.cc
rc/google/protobuf/unittest.proto
rc/google/protobuf/unittest_enormous_descriptor.proto
rc/google/protobuf/unittest_import_micro.proto
rc/google/protobuf/unittest_micro.proto
rc/google/protobuf/unittest_no_generic_services.proto
rc/google/protobuf/unittest_recursive_micro.proto
rc/google/protobuf/unittest_simple_micro.proto
rc/google/protobuf/unittest_stringutf8_micro.proto
rc/google/protobuf/unknown_field_set.cc
rc/google/protobuf/unknown_field_set.h
rc/google/protobuf/wire_format.cc
rc/google/protobuf/wire_format_lite.cc
rc/google/protobuf/wire_format_lite.h
rc/google/protobuf/wire_format_lite_inl.h
rc/google/protobuf/wire_format_unittest.cc
sprojects/config.h
sprojects/libprotobuf-lite.vcproj
sprojects/libprotobuf.vcproj
sprojects/libprotoc.vcproj
sprojects/lite-test.vcproj
sprojects/protobuf.sln
sprojects/test_plugin.vcproj
sprojects/tests.vcproj
ede38fe9b9f93888e6e41afc7abb09525f44da95 28-May-2010 Wink Saville <wink@google.com> Add support for Java micro protobuf's to protobuf-2.2.0a.

See README.android for additional information.

Change-Id: I9c5ef2eec484cc87e32841f39060f8f27b8e8472
gitignore
ndroid.mk
EADME.android
ava/README.txt
ava/pom.xml
ava/src/main/java/com/google/protobuf/micro/ByteStringMicro.java
ava/src/main/java/com/google/protobuf/micro/CodedInputStreamMicro.java
ava/src/main/java/com/google/protobuf/micro/CodedOutputStreamMicro.java
ava/src/main/java/com/google/protobuf/micro/InvalidProtocolBufferMicroException.java
ava/src/main/java/com/google/protobuf/micro/MessageMicro.java
ava/src/main/java/com/google/protobuf/micro/StringUtf8Micro.java
ava/src/main/java/com/google/protobuf/micro/WireFormatMicro.java
ava/src/test/java/com/google/protobuf/MicroTest.java
ava/src/test/java/com/google/protobuf/PerfTimer.java
rc/Makefile.am
rc/Makefile.in
rc/google/protobuf/compiler/javamicro/javamicro_enum.cc
rc/google/protobuf/compiler/javamicro/javamicro_enum.h
rc/google/protobuf/compiler/javamicro/javamicro_enum_field.cc
rc/google/protobuf/compiler/javamicro/javamicro_enum_field.h
rc/google/protobuf/compiler/javamicro/javamicro_field.cc
rc/google/protobuf/compiler/javamicro/javamicro_field.h
rc/google/protobuf/compiler/javamicro/javamicro_file.cc
rc/google/protobuf/compiler/javamicro/javamicro_file.h
rc/google/protobuf/compiler/javamicro/javamicro_generator.cc
rc/google/protobuf/compiler/javamicro/javamicro_generator.h
rc/google/protobuf/compiler/javamicro/javamicro_helpers.cc
rc/google/protobuf/compiler/javamicro/javamicro_helpers.h
rc/google/protobuf/compiler/javamicro/javamicro_message.cc
rc/google/protobuf/compiler/javamicro/javamicro_message.h
rc/google/protobuf/compiler/javamicro/javamicro_message_field.cc
rc/google/protobuf/compiler/javamicro/javamicro_message_field.h
rc/google/protobuf/compiler/javamicro/javamicro_params.h
rc/google/protobuf/compiler/javamicro/javamicro_primitive_field.cc
rc/google/protobuf/compiler/javamicro/javamicro_primitive_field.h
rc/google/protobuf/compiler/main.cc
rc/google/protobuf/unittest_import_micro.proto
rc/google/protobuf/unittest_micro.proto
rc/google/protobuf/unittest_recursive_micro.proto
rc/google/protobuf/unittest_simple_micro.proto
rc/google/protobuf/unittest_stringutf8_micro.proto
fbaaef999ba563838ebd00874ed8a1c01fbf286d 28-May-2010 Wink Saville <wink@google.com> 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
HANGES.txt
ONTRIBUTORS.txt
OPYING.txt
NSTALL.txt
akefile.am
akefile.in
EADME.txt
clocal.m4
utogen.sh
onfig.guess
onfig.h.in
onfig.sub
onfigure
onfigure.ac
epcomp
ditors/README.txt
ditors/proto.vim
ditors/protobuf-mode.el
xamples/AddPerson.java
xamples/ListPeople.java
xamples/Makefile
xamples/README.txt
xamples/add_person.cc
xamples/add_person.py
xamples/addressbook.proto
xamples/list_people.cc
xamples/list_people.py
enerate_descriptor_proto.sh
test/CHANGES
test/CONTRIBUTORS
test/COPYING
test/Makefile.am
test/Makefile.in
test/README
test/aclocal.m4
test/build-aux/config.guess
test/build-aux/config.h.in
test/build-aux/config.sub
test/build-aux/depcomp
test/build-aux/install-sh
test/build-aux/ltmain.sh
test/build-aux/missing
test/codegear/gtest.cbproj
test/codegear/gtest.groupproj
test/codegear/gtest_all.cc
test/codegear/gtest_link.cc
test/codegear/gtest_main.cbproj
test/codegear/gtest_unittest.cbproj
test/configure
test/configure.ac
test/include/gtest/gtest-death-test.h
test/include/gtest/gtest-message.h
test/include/gtest/gtest-param-test.h
test/include/gtest/gtest-param-test.h.pump
test/include/gtest/gtest-spi.h
test/include/gtest/gtest-test-part.h
test/include/gtest/gtest-typed-test.h
test/include/gtest/gtest.h
test/include/gtest/gtest_pred_impl.h
test/include/gtest/gtest_prod.h
test/include/gtest/internal/gtest-death-test-internal.h
test/include/gtest/internal/gtest-filepath.h
test/include/gtest/internal/gtest-internal.h
test/include/gtest/internal/gtest-linked_ptr.h
test/include/gtest/internal/gtest-param-util-generated.h
test/include/gtest/internal/gtest-param-util-generated.h.pump
test/include/gtest/internal/gtest-param-util.h
test/include/gtest/internal/gtest-port.h
test/include/gtest/internal/gtest-string.h
test/include/gtest/internal/gtest-tuple.h
test/include/gtest/internal/gtest-tuple.h.pump
test/include/gtest/internal/gtest-type-util.h
test/include/gtest/internal/gtest-type-util.h.pump
test/m4/acx_pthread.m4
test/m4/gtest.m4
test/make/Makefile
test/msvc/gtest.sln
test/msvc/gtest.vcproj
test/msvc/gtest_color_test_.vcproj
test/msvc/gtest_env_var_test_.vcproj
test/msvc/gtest_environment_test.vcproj
test/msvc/gtest_main.vcproj
test/msvc/gtest_output_test_.vcproj
test/msvc/gtest_prod_test.vcproj
test/msvc/gtest_uninitialized_test_.vcproj
test/msvc/gtest_unittest.vcproj
test/samples/prime_tables.h
test/samples/sample1.cc
test/samples/sample1.h
test/samples/sample1_unittest.cc
test/samples/sample2.cc
test/samples/sample2.h
test/samples/sample2_unittest.cc
test/samples/sample3-inl.h
test/samples/sample3_unittest.cc
test/samples/sample4.cc
test/samples/sample4.h
test/samples/sample4_unittest.cc
test/samples/sample5_unittest.cc
test/samples/sample6_unittest.cc
test/samples/sample7_unittest.cc
test/samples/sample8_unittest.cc
test/scons/SConscript
test/scripts/fuse_gtest_files.py
test/scripts/gen_gtest_pred_impl.py
test/scripts/gtest-config.in
test/scripts/test/Makefile
test/src/gtest-all.cc
test/src/gtest-death-test.cc
test/src/gtest-filepath.cc
test/src/gtest-internal-inl.h
test/src/gtest-port.cc
test/src/gtest-test-part.cc
test/src/gtest-typed-test.cc
test/src/gtest.cc
test/src/gtest_main.cc
test/test/gtest-death-test_test.cc
test/test/gtest-filepath_test.cc
test/test/gtest-linked_ptr_test.cc
test/test/gtest-message_test.cc
test/test/gtest-options_test.cc
test/test/gtest-param-test2_test.cc
test/test/gtest-param-test_test.cc
test/test/gtest-param-test_test.h
test/test/gtest-port_test.cc
test/test/gtest-test-part_test.cc
test/test/gtest-tuple_test.cc
test/test/gtest-typed-test2_test.cc
test/test/gtest-typed-test_test.cc
test/test/gtest-typed-test_test.h
test/test/gtest-unittest-api_test.cc
test/test/gtest_all_test.cc
test/test/gtest_break_on_failure_unittest.py
test/test/gtest_break_on_failure_unittest_.cc
test/test/gtest_color_test.py
test/test/gtest_color_test_.cc
test/test/gtest_env_var_test.py
test/test/gtest_env_var_test_.cc
test/test/gtest_environment_test.cc
test/test/gtest_filter_unittest.py
test/test/gtest_filter_unittest_.cc
test/test/gtest_help_test.py
test/test/gtest_help_test_.cc
test/test/gtest_list_tests_unittest.py
test/test/gtest_list_tests_unittest_.cc
test/test/gtest_main_unittest.cc
test/test/gtest_nc.cc
test/test/gtest_nc_test.py
test/test/gtest_no_test_unittest.cc
test/test/gtest_output_test.py
test/test/gtest_output_test_.cc
test/test/gtest_output_test_golden_lin.txt
test/test/gtest_output_test_golden_win.txt
test/test/gtest_pred_impl_unittest.cc
test/test/gtest_prod_test.cc
test/test/gtest_repeat_test.cc
test/test/gtest_sole_header_test.cc
test/test/gtest_stress_test.cc
test/test/gtest_test_utils.py
test/test/gtest_throw_on_failure_ex_test.cc
test/test/gtest_throw_on_failure_test.py
test/test/gtest_throw_on_failure_test_.cc
test/test/gtest_uninitialized_test.py
test/test/gtest_uninitialized_test_.cc
test/test/gtest_unittest.cc
test/test/gtest_xml_outfile1_test_.cc
test/test/gtest_xml_outfile2_test_.cc
test/test/gtest_xml_outfiles_test.py
test/test/gtest_xml_output_unittest.py
test/test/gtest_xml_output_unittest_.cc
test/test/gtest_xml_test_utils.py
test/test/production.cc
test/test/production.h
test/xcode/Config/DebugProject.xcconfig
test/xcode/Config/FrameworkTarget.xcconfig
test/xcode/Config/General.xcconfig
test/xcode/Config/InternalPythonTestTarget.xcconfig
test/xcode/Config/InternalTestTarget.xcconfig
test/xcode/Config/ReleaseProject.xcconfig
test/xcode/Config/TestTarget.xcconfig
test/xcode/Resources/Info.plist
test/xcode/Samples/FrameworkSample/Info.plist
test/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
test/xcode/Samples/FrameworkSample/widget.cc
test/xcode/Samples/FrameworkSample/widget.h
test/xcode/Samples/FrameworkSample/widget_test.cc
test/xcode/Scripts/runtests.sh
test/xcode/Scripts/versiongenerate.py
test/xcode/gtest.xcodeproj/project.pbxproj
nstall-sh
ava/README.txt
ava/pom.xml
ava/src/main/java/com/google/protobuf/AbstractMessage.java
ava/src/main/java/com/google/protobuf/AbstractMessageLite.java
ava/src/main/java/com/google/protobuf/BlockingRpcChannel.java
ava/src/main/java/com/google/protobuf/BlockingService.java
ava/src/main/java/com/google/protobuf/ByteString.java
ava/src/main/java/com/google/protobuf/CodedInputStream.java
ava/src/main/java/com/google/protobuf/CodedOutputStream.java
ava/src/main/java/com/google/protobuf/Descriptors.java
ava/src/main/java/com/google/protobuf/DynamicMessage.java
ava/src/main/java/com/google/protobuf/ExtensionRegistry.java
ava/src/main/java/com/google/protobuf/ExtensionRegistryLite.java
ava/src/main/java/com/google/protobuf/FieldSet.java
ava/src/main/java/com/google/protobuf/GeneratedMessage.java
ava/src/main/java/com/google/protobuf/GeneratedMessageLite.java
ava/src/main/java/com/google/protobuf/Internal.java
ava/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java
ava/src/main/java/com/google/protobuf/Message.java
ava/src/main/java/com/google/protobuf/MessageLite.java
ava/src/main/java/com/google/protobuf/ProtocolMessageEnum.java
ava/src/main/java/com/google/protobuf/RpcCallback.java
ava/src/main/java/com/google/protobuf/RpcChannel.java
ava/src/main/java/com/google/protobuf/RpcController.java
ava/src/main/java/com/google/protobuf/RpcUtil.java
ava/src/main/java/com/google/protobuf/Service.java
ava/src/main/java/com/google/protobuf/ServiceException.java
ava/src/main/java/com/google/protobuf/TextFormat.java
ava/src/main/java/com/google/protobuf/UninitializedMessageException.java
ava/src/main/java/com/google/protobuf/UnknownFieldSet.java
ava/src/main/java/com/google/protobuf/WireFormat.java
ava/src/test/java/com/google/protobuf/AbstractMessageTest.java
ava/src/test/java/com/google/protobuf/CodedInputStreamTest.java
ava/src/test/java/com/google/protobuf/CodedOutputStreamTest.java
ava/src/test/java/com/google/protobuf/DescriptorsTest.java
ava/src/test/java/com/google/protobuf/DynamicMessageTest.java
ava/src/test/java/com/google/protobuf/GeneratedMessageTest.java
ava/src/test/java/com/google/protobuf/LiteTest.java
ava/src/test/java/com/google/protobuf/MessageTest.java
ava/src/test/java/com/google/protobuf/ServiceTest.java
ava/src/test/java/com/google/protobuf/TestUtil.java
ava/src/test/java/com/google/protobuf/TextFormatTest.java
ava/src/test/java/com/google/protobuf/UnknownFieldSetTest.java
ava/src/test/java/com/google/protobuf/WireFormatTest.java
ava/src/test/java/com/google/protobuf/multiple_files_test.proto
tmain.sh
4/ac_system_extensions.m4
4/acx_check_suncc.m4
4/acx_pthread.m4
4/libtool.m4
4/ltoptions.m4
4/ltsugar.m4
4/ltversion.m4
4/lt~obsolete.m4
4/stl_hash.m4
issing
rotobuf-lite.pc.in
rotobuf.pc.in
ython/README.txt
ython/ez_setup.py
ython/google/__init__.py
ython/google/protobuf/__init__.py
ython/google/protobuf/descriptor.py
ython/google/protobuf/internal/__init__.py
ython/google/protobuf/internal/containers.py
ython/google/protobuf/internal/decoder.py
ython/google/protobuf/internal/decoder_test.py
ython/google/protobuf/internal/descriptor_test.py
ython/google/protobuf/internal/encoder.py
ython/google/protobuf/internal/encoder_test.py
ython/google/protobuf/internal/generator_test.py
ython/google/protobuf/internal/input_stream.py
ython/google/protobuf/internal/input_stream_test.py
ython/google/protobuf/internal/message_listener.py
ython/google/protobuf/internal/message_test.py
ython/google/protobuf/internal/more_extensions.proto
ython/google/protobuf/internal/more_messages.proto
ython/google/protobuf/internal/output_stream.py
ython/google/protobuf/internal/output_stream_test.py
ython/google/protobuf/internal/reflection_test.py
ython/google/protobuf/internal/service_reflection_test.py
ython/google/protobuf/internal/test_util.py
ython/google/protobuf/internal/text_format_test.py
ython/google/protobuf/internal/type_checkers.py
ython/google/protobuf/internal/wire_format.py
ython/google/protobuf/internal/wire_format_test.py
ython/google/protobuf/message.py
ython/google/protobuf/reflection.py
ython/google/protobuf/service.py
ython/google/protobuf/service_reflection.py
ython/google/protobuf/text_format.py
ython/mox.py
ython/setup.py
ython/stubout.py
rc/Makefile.am
rc/Makefile.in
rc/google/protobuf/compiler/code_generator.cc
rc/google/protobuf/compiler/code_generator.h
rc/google/protobuf/compiler/command_line_interface.cc
rc/google/protobuf/compiler/command_line_interface.h
rc/google/protobuf/compiler/command_line_interface_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc
rc/google/protobuf/compiler/cpp/cpp_enum.cc
rc/google/protobuf/compiler/cpp/cpp_enum.h
rc/google/protobuf/compiler/cpp/cpp_enum_field.cc
rc/google/protobuf/compiler/cpp/cpp_enum_field.h
rc/google/protobuf/compiler/cpp/cpp_extension.cc
rc/google/protobuf/compiler/cpp/cpp_extension.h
rc/google/protobuf/compiler/cpp/cpp_field.cc
rc/google/protobuf/compiler/cpp/cpp_field.h
rc/google/protobuf/compiler/cpp/cpp_file.cc
rc/google/protobuf/compiler/cpp/cpp_file.h
rc/google/protobuf/compiler/cpp/cpp_generator.cc
rc/google/protobuf/compiler/cpp/cpp_generator.h
rc/google/protobuf/compiler/cpp/cpp_helpers.cc
rc/google/protobuf/compiler/cpp/cpp_helpers.h
rc/google/protobuf/compiler/cpp/cpp_message.cc
rc/google/protobuf/compiler/cpp/cpp_message.h
rc/google/protobuf/compiler/cpp/cpp_message_field.cc
rc/google/protobuf/compiler/cpp/cpp_message_field.h
rc/google/protobuf/compiler/cpp/cpp_primitive_field.cc
rc/google/protobuf/compiler/cpp/cpp_primitive_field.h
rc/google/protobuf/compiler/cpp/cpp_service.cc
rc/google/protobuf/compiler/cpp/cpp_service.h
rc/google/protobuf/compiler/cpp/cpp_string_field.cc
rc/google/protobuf/compiler/cpp/cpp_string_field.h
rc/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto
rc/google/protobuf/compiler/cpp/cpp_unittest.cc
rc/google/protobuf/compiler/importer.cc
rc/google/protobuf/compiler/importer.h
rc/google/protobuf/compiler/importer_unittest.cc
rc/google/protobuf/compiler/java/java_enum.cc
rc/google/protobuf/compiler/java/java_enum.h
rc/google/protobuf/compiler/java/java_enum_field.cc
rc/google/protobuf/compiler/java/java_enum_field.h
rc/google/protobuf/compiler/java/java_extension.cc
rc/google/protobuf/compiler/java/java_extension.h
rc/google/protobuf/compiler/java/java_field.cc
rc/google/protobuf/compiler/java/java_field.h
rc/google/protobuf/compiler/java/java_file.cc
rc/google/protobuf/compiler/java/java_file.h
rc/google/protobuf/compiler/java/java_generator.cc
rc/google/protobuf/compiler/java/java_generator.h
rc/google/protobuf/compiler/java/java_helpers.cc
rc/google/protobuf/compiler/java/java_helpers.h
rc/google/protobuf/compiler/java/java_message.cc
rc/google/protobuf/compiler/java/java_message.h
rc/google/protobuf/compiler/java/java_message_field.cc
rc/google/protobuf/compiler/java/java_message_field.h
rc/google/protobuf/compiler/java/java_primitive_field.cc
rc/google/protobuf/compiler/java/java_primitive_field.h
rc/google/protobuf/compiler/java/java_service.cc
rc/google/protobuf/compiler/java/java_service.h
rc/google/protobuf/compiler/main.cc
rc/google/protobuf/compiler/package_info.h
rc/google/protobuf/compiler/parser.cc
rc/google/protobuf/compiler/parser.h
rc/google/protobuf/compiler/parser_unittest.cc
rc/google/protobuf/compiler/python/python_generator.cc
rc/google/protobuf/compiler/python/python_generator.h
rc/google/protobuf/descriptor.cc
rc/google/protobuf/descriptor.h
rc/google/protobuf/descriptor.pb.cc
rc/google/protobuf/descriptor.pb.h
rc/google/protobuf/descriptor.proto
rc/google/protobuf/descriptor_database.cc
rc/google/protobuf/descriptor_database.h
rc/google/protobuf/descriptor_database_unittest.cc
rc/google/protobuf/descriptor_unittest.cc
rc/google/protobuf/dynamic_message.cc
rc/google/protobuf/dynamic_message.h
rc/google/protobuf/dynamic_message_unittest.cc
rc/google/protobuf/extension_set.cc
rc/google/protobuf/extension_set.h
rc/google/protobuf/extension_set_heavy.cc
rc/google/protobuf/extension_set_unittest.cc
rc/google/protobuf/generated_message_reflection.cc
rc/google/protobuf/generated_message_reflection.h
rc/google/protobuf/generated_message_reflection_unittest.cc
rc/google/protobuf/generated_message_util.cc
rc/google/protobuf/generated_message_util.h
rc/google/protobuf/io/coded_stream.cc
rc/google/protobuf/io/coded_stream.h
rc/google/protobuf/io/coded_stream_unittest.cc
rc/google/protobuf/io/gzip_stream.cc
rc/google/protobuf/io/gzip_stream.h
rc/google/protobuf/io/gzip_stream_unittest.sh
rc/google/protobuf/io/package_info.h
rc/google/protobuf/io/printer.cc
rc/google/protobuf/io/printer.h
rc/google/protobuf/io/printer_unittest.cc
rc/google/protobuf/io/tokenizer.cc
rc/google/protobuf/io/tokenizer.h
rc/google/protobuf/io/tokenizer_unittest.cc
rc/google/protobuf/io/zero_copy_stream.cc
rc/google/protobuf/io/zero_copy_stream.h
rc/google/protobuf/io/zero_copy_stream_impl.cc
rc/google/protobuf/io/zero_copy_stream_impl.h
rc/google/protobuf/io/zero_copy_stream_impl_lite.cc
rc/google/protobuf/io/zero_copy_stream_impl_lite.h
rc/google/protobuf/io/zero_copy_stream_unittest.cc
rc/google/protobuf/lite_unittest.cc
rc/google/protobuf/message.cc
rc/google/protobuf/message.h
rc/google/protobuf/message_lite.cc
rc/google/protobuf/message_lite.h
rc/google/protobuf/message_unittest.cc
rc/google/protobuf/package_info.h
rc/google/protobuf/reflection_ops.cc
rc/google/protobuf/reflection_ops.h
rc/google/protobuf/reflection_ops_unittest.cc
rc/google/protobuf/repeated_field.cc
rc/google/protobuf/repeated_field.h
rc/google/protobuf/repeated_field_unittest.cc
rc/google/protobuf/service.cc
rc/google/protobuf/service.h
rc/google/protobuf/stubs/common.cc
rc/google/protobuf/stubs/common.h
rc/google/protobuf/stubs/common_unittest.cc
rc/google/protobuf/stubs/hash.cc
rc/google/protobuf/stubs/hash.h
rc/google/protobuf/stubs/map-util.h
rc/google/protobuf/stubs/once.cc
rc/google/protobuf/stubs/once.h
rc/google/protobuf/stubs/once_unittest.cc
rc/google/protobuf/stubs/stl_util-inl.h
rc/google/protobuf/stubs/structurally_valid.cc
rc/google/protobuf/stubs/structurally_valid_unittest.cc
rc/google/protobuf/stubs/strutil.cc
rc/google/protobuf/stubs/strutil.h
rc/google/protobuf/stubs/strutil_unittest.cc
rc/google/protobuf/stubs/substitute.cc
rc/google/protobuf/stubs/substitute.h
rc/google/protobuf/test_util.cc
rc/google/protobuf/test_util.h
rc/google/protobuf/test_util_lite.cc
rc/google/protobuf/test_util_lite.h
rc/google/protobuf/testdata/golden_message
rc/google/protobuf/testdata/golden_packed_fields_message
rc/google/protobuf/testdata/text_format_unittest_data.txt
rc/google/protobuf/testdata/text_format_unittest_extensions_data.txt
rc/google/protobuf/testing/file.cc
rc/google/protobuf/testing/file.h
rc/google/protobuf/testing/googletest.cc
rc/google/protobuf/testing/googletest.h
rc/google/protobuf/testing/zcgunzip.cc
rc/google/protobuf/testing/zcgzip.cc
rc/google/protobuf/text_format.cc
rc/google/protobuf/text_format.h
rc/google/protobuf/text_format_unittest.cc
rc/google/protobuf/unittest.proto
rc/google/protobuf/unittest_custom_options.proto
rc/google/protobuf/unittest_embed_optimize_for.proto
rc/google/protobuf/unittest_empty.proto
rc/google/protobuf/unittest_enormous_descriptor.proto
rc/google/protobuf/unittest_import.proto
rc/google/protobuf/unittest_import_lite.proto
rc/google/protobuf/unittest_lite.proto
rc/google/protobuf/unittest_lite_imports_nonlite.proto
rc/google/protobuf/unittest_mset.proto
rc/google/protobuf/unittest_optimize_for.proto
rc/google/protobuf/unknown_field_set.cc
rc/google/protobuf/unknown_field_set.h
rc/google/protobuf/unknown_field_set_unittest.cc
rc/google/protobuf/wire_format.cc
rc/google/protobuf/wire_format.h
rc/google/protobuf/wire_format_lite.cc
rc/google/protobuf/wire_format_lite.h
rc/google/protobuf/wire_format_lite_inl.h
rc/google/protobuf/wire_format_unittest.cc
rc/solaris/libstdc++.la
sprojects/config.h
sprojects/convert2008to2005.sh
sprojects/extract_includes.bat
sprojects/libprotobuf-lite.vcproj
sprojects/libprotobuf.vcproj
sprojects/libprotoc.vcproj
sprojects/lite-test.vcproj
sprojects/protobuf.sln
sprojects/protoc.vcproj
sprojects/readme.txt
sprojects/tests.vcproj
79a4a60053f74ab71c7c3ec436d2f6caedc5be61 28-May-2010 Wink Saville <wink@google.com> The Android specific files prior to adding protobuf 2.2.0a sources.

Change-Id: Ib1009c088a3815c9152385e2b764a2c7cd28317e
ndroid.mk
ODULE_LICENSE_BSD_LIKE
EADME.android
3e6833eec60b81e825555d5a3bfc91a08c6e9df3 09-Mar-2010 Jean-Baptiste Queru <jbq@google.com> Add an empty CleanSpec.mk

Change-Id: I7c626546a9c52c78e0e48749a34596235ee32a84
leanSpec.mk
7cebc5e397263b309174af651a404aa6dccf97b3 05-Feb-2010 The Android Open Source Project <initial-contribution@android.com> am 96ccdc22: reconcile main tree with open-source eclair

Merge commit '96ccdc223b71f9e356d10ed3199007567996e062'

* commit '96ccdc223b71f9e356d10ed3199007567996e062':
android-2.1_r1 snapshot
96ccdc223b71f9e356d10ed3199007567996e062 05-Feb-2010 The Android Open Source Project <initial-contribution@android.com> reconcile main tree with open-source eclair
9fb23fe446fc60cc135dae3154d14fdae17d37ba 29-Jan-2010 The Android Open Source Project <initial-contribution@android.com> reconcile android-2.1_r1 snapshot
067706ec540472f040065cc0c6236752b31cf61d 13-Jan-2010 The Android Open Source Project <initial-contribution@android.com> android-2.1_r1 snapshot
5635728f879b131d9e407c6d43a713e072b22b01 14-Nov-2009 Dan Egnor <egnor@google.com> The j2me protobuf code is now in vendor/google; remove it here.
rc/com/google/common/io/protocol/BoundInputStream.java
rc/com/google/common/io/protocol/ProtoBuf.java
rc/com/google/common/io/protocol/ProtoBufType.java
rc/com/google/common/io/protocol/ProtoBufUtil.java
rc/com/google/common/io/protocol/package.html
5493c80527770594637ddb7ca96725e7d2e04310 26-Jul-2009 Jean-Baptiste Queru <jbq@google.com> reconcile korg/master into goog/master
7e659bba0057942c441c810681f33928bcd486c9 26-Jul-2009 Jean-Baptiste Queru <jbq@google.com> Merge korg/donut into korg/master
79959e70d722e8f3aaf5d420a27fd98676d586f3 11-Jun-2009 Adam Bliss <abliss@google.com> 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
a67f19deb0794784d1b841bc1900328103af03c5 11-Jun-2009 Adam Bliss <abliss@google.com> Adds a few utilities to ProtoBufUtil, integrating over from mainline
rc/com/google/common/io/protocol/BoundInputStream.java
rc/com/google/common/io/protocol/ProtoBufUtil.java
f958768159817dba6d01befa2fd70786e3c1ea26 11-Jun-2009 Mitsuru Oshima <oshima@google.com> am 7fea449b: Revert "ProtoBuf update"

Merge commit '7fea449b53848057686ac4266ee51853bda70e30'

* commit '7fea449b53848057686ac4266ee51853bda70e30':
Revert "ProtoBuf update"
7fea449b53848057686ac4266ee51853bda70e30 11-Jun-2009 Mitsuru Oshima <oshima@google.com> Revert "ProtoBuf update"

This reverts commit 9aaf507646c866ab131bf2bcd973882ff9f553cf.
rc/com/google/common/io/protocol/IntMap.java
rc/com/google/common/io/protocol/ProtoBuf.java
rc/com/google/common/io/protocol/ProtoBufType.java
rc/com/google/common/io/protocol/ProtoBufUtil.java
e1db06285718a64bb5000c88512bb35545aa7b4d 10-Jun-2009 Mitsuru Oshima <oshima@google.com> 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
9aaf507646c866ab131bf2bcd973882ff9f553cf 10-Jun-2009 Mitsuru Oshima <oshima@google.com> 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.
rc/com/google/common/io/protocol/IntMap.java
rc/com/google/common/io/protocol/ProtoBuf.java
rc/com/google/common/io/protocol/ProtoBufType.java
rc/com/google/common/io/protocol/ProtoBufUtil.java
f1391c740d3eecf14f0e24d899f5a3760dd608b9 23-Apr-2009 Jean-Baptiste Queru <jbq@google.com> Merge donut into master
8d2478a896b5cac3365b868eb5818ce25017f423 29-Mar-2009 The Android Open Source Project <initial-contribution@android.com> Merge branch 'open_source_no_contributions' into google_internal
a73ffd65100ea5d53b4295d2a810690304f21fcf 27-Mar-2009 The Android Open Source Project <initial-contribution@android.com> Merge commit 'korg/cupcake'
eda64ea9d79d70333a86cefb9659adf4d144884a 19-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@140373
rc/com/google/common/io/protocol/ProtoBuf.java
3a3adcaf1d6c9692c1b0c53ad230e9286478ba30 18-Mar-2009 Jean-Baptiste Queru <jbq@google.com> Merge commit 'remotes/korg/cupcake' into merge
e3e6e3d8aa7ac32e0f80588f6403fc18f7e476a7 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
rc/com/google/common/io/protocol/ProtoBuf.java
rc/com/google/common/io/protocol/ProtoBufType.java
rc/com/google/common/io/protocol/ProtoBufUtil.java
rc/com/google/common/io/protocol/package.html
1ca0f15a18c4af59a0627fa26d20c9be0b4896d4 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
rc/com/google/common/io/protocol/ProtoBuf.java
rc/com/google/common/io/protocol/ProtoBufType.java
rc/com/google/common/io/protocol/ProtoBufUtil.java
rc/com/google/common/io/protocol/package.html
e834f9dbe7a360a72336daeb243015e082e67dd9 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@132589
rc/com/google/common/io/protocol/ProtoBuf.java
e61379af83d28b36d9085ac181b01e4852fcd171 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@137055
rc/com/google/common/io/protocol/ProtoBuf.java
15bf10329ff5ed4b039918df3f053eaf67851e1b 19-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@132276
rc/com/google/common/io/protocol/ProtoBuf.java
rc/com/google/common/io/protocol/ProtoBufType.java
rc/com/google/common/io/protocol/ProtoBufUtil.java
214e14d5efd24389ae5bd7c3debe4bb28dbd667a 11-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@130745
rc/com/google/common/io/protocol/ProtoBuf.java
2f1917b2d9754d6288e8de2739469bf719438388 18-Dec-2008 The Android Open Source Project <initial-contribution@android.com> Code drop from //branches/cupcake/...@124589
35be73bfebdd5cf76922b2a44b15ebbbeaa8d079 21-Oct-2008 The Android Open Source Project <initial-contribution@android.com> Initial Contribution
rc/com/google/common/io/protocol/ProtoBuf.java
rc/com/google/common/io/protocol/ProtoBufType.java
rc/com/google/common/io/protocol/ProtoBufUtil.java
rc/com/google/common/io/protocol/package.html