commit 436d8808f6ff531eb1112a6639aaf59273eb6878
author Hyunyoung Song <hyunyoungs@google.com> Thu Nov 24 02:05:29 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 24 02:05:29 2016 +0000
tree fdd95af92779676d74c0b20470568c1c5b3fba34
parent b406f8171435552f24289a388ca6dea0b1728d9c
parent aff2b79dffbc366746bd1f8db1125b8a6afb6c22

resolve merge conflicts of f82aba0 to nyc-mr1-dev-plus-aosp am: 1b1b84e96a  -s ours am: 57d4540382
am: aff2b79dff

Change-Id: Ib642f0d5420b6b7d3aa29ef53da51fd1da6cb938

protos/launcher_log.proto

diff --git a/protos/launcher_log.proto b/protos/launcher_log.proto
index 448cf64..6b27559 100644
--- a/protos/launcher_log.proto
+++ b/protos/launcher_log.proto
@@ -15,7 +15,7 @@
  */
 syntax = "proto2";
 
-option java_package = "com.android.launcher3.userevent.nano";
+option java_package = "com.android.launcher3.userevent";
 option java_outer_classname = "LauncherLogProto";
 
 package userevent;