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

resolve merge conflicts of 7520e49 to nyc-dev-plus-aosp am: 3e906a925c am: 724e51e88d am: 044e71c2d0
am: 74d09c3dea

Change-Id: I090af0ecbc90d833a06b5a4f26010b85d09edb42

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;