summaryrefslogtreecommitdiffstats
path: root/third_party/android_protobuf
diff options
context:
space:
mode:
authorColin Meek <meek@chromium.org>2014-09-05 14:54:15 -0700
committerTommy Nyquist <nyquist@chromium.org>2014-09-05 21:57:06 +0000
commite0995c041b77d1c08e7652f44de918b275efbd0b (patch)
tree79d47bfe110093b0604fbbf1cb44f8b37c832aea /third_party/android_protobuf
parentd73b3eff6f2372cc46bbe8c6c4b9f2b8d377bdc2 (diff)
downloadchromium_src-e0995c041b77d1c08e7652f44de918b275efbd0b.zip
chromium_src-e0995c041b77d1c08e7652f44de918b275efbd0b.tar.gz
chromium_src-e0995c041b77d1c08e7652f44de918b275efbd0b.tar.bz2
Updating android_protobuf to L-preview branch
Adding support for the optional_field_style=reftypes flag. This is needed for the invalidation client which expects "boxed" types (e.g., Boolean rather than boolean) for primitive fields, and depends on null comparisons to determine whether or not a field is set. BUG=377891,411282 R=nyquist@chromium.org Review URL: https://codereview.chromium.org/549543002 Patch from Colin Meek <meek@chromium.org>. Cr-Commit-Position: refs/heads/master@{#293583}
Diffstat (limited to 'third_party/android_protobuf')
-rw-r--r--third_party/android_protobuf/OWNERS1
-rw-r--r--third_party/android_protobuf/README.chromium2
2 files changed, 2 insertions, 1 deletions
diff --git a/third_party/android_protobuf/OWNERS b/third_party/android_protobuf/OWNERS
index a612398..8c5a1bb 100644
--- a/third_party/android_protobuf/OWNERS
+++ b/third_party/android_protobuf/OWNERS
@@ -1,2 +1,3 @@
cjhopman@chromium.org
nyquist@chromium.org
+meek@chromium.org \ No newline at end of file
diff --git a/third_party/android_protobuf/README.chromium b/third_party/android_protobuf/README.chromium
index fec1d3a..2bd0777 100644
--- a/third_party/android_protobuf/README.chromium
+++ b/third_party/android_protobuf/README.chromium
@@ -2,7 +2,7 @@ Name: Protocol Buffers - Google's data interchange format
Short Name: protobuf
URL: https://android.googlesource.com/platform/external/protobuf.git
Version: 2.2.0a
-Revision: Android 4.4.4 Release 2.0.1
+Revision: L-preview
License: BSD
License File: src/COPYING.txt
Security Critical: no