summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Duff <bduff@google.com>2015-03-20 23:15:15 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-20 23:15:15 +0000
commit27f6de2e0af57f115d5f52d90ef552a5179a9fed (patch)
tree4c27c2f1bfc1f5918aaa3d5e9be6b0fabb656343
parent6bcc95f7df592ad6ca91527a294503afc27dcf6c (diff)
parenta20fd65468ba6975aa65f1fe565d3dfd23207621 (diff)
downloadexternal_protobuf-27f6de2e0af57f115d5f52d90ef552a5179a9fed.zip
external_protobuf-27f6de2e0af57f115d5f52d90ef552a5179a9fed.tar.gz
external_protobuf-27f6de2e0af57f115d5f52d90ef552a5179a9fed.tar.bz2
am a20fd654: am c4e7b92f: Merge "Make the tag field public."
* commit 'a20fd65468ba6975aa65f1fe565d3dfd23207621': Make the tag field public.
-rw-r--r--java/src/main/java/com/google/protobuf/nano/Extension.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/main/java/com/google/protobuf/nano/Extension.java b/java/src/main/java/com/google/protobuf/nano/Extension.java
index 962f66e..a851daf 100644
--- a/java/src/main/java/com/google/protobuf/nano/Extension.java
+++ b/java/src/main/java/com/google/protobuf/nano/Extension.java
@@ -138,7 +138,7 @@ public class Extension<M extends ExtendableMessageNano<M>, T> {
/**
* Tag number of this extension.
*/
- protected final int tag;
+ public final int tag;
/**
* Whether this extension is repeated.