Roll src/third_party/android_protobuf 94f522f9:999188d0

third_party/cacheinvalidation/src/proto/android_channel.proto

 /*
  * Copyright 2011 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
@@ skipping 17 matching lines @@
 option java_outer_classname = "NanoAndroidChannel";
 option java_package = "com.google.protos.ipc.invalidation";
 
 
 import "client_protocol.proto";
 
 // Defines the valid major versions of the android channel protocol.  The
 // channel version controls the expected envelope syntax and semantics of
 // http and c2dm messages sent between the client and server.
 enum MajorVersion {
+  option allow_alias = true;
 
   // The initial version of the android channel protocol.  Inbound and
   // outbound channel packets contained a single binary protocol message only.
   INITIAL = 0;
 
   // Adds batching (multiple protocol messages in a single channel message)
   BATCH = 1;
 
   // The default channel version used by Android clients.   Lower major numbers
   // will represent earlier versions and higher numbers will represent
@@ skipping 39 matching lines @@
 
   // Message contents (serialized ServerToClientMessage).
   optional bytes message = 2;
 }
 
 // A batch of messages addressed to potentially-different Ticls on the same
 // Android device.
 message AddressedAndroidMessageBatch {
   repeated AddressedAndroidMessage addressed_message = 1;
 }