commit 5d6217dc0399a64466c28f9c3dd07585345b3f65
author Hyunyoung Song <hyunyoungs@google.com> Thu Nov 24 02:05:49 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 24 02:05:49 2016 +0000
tree fdd95af92779676d74c0b20470568c1c5b3fba34
parent f3e74be3fcc07856a6e497bf236576583cfc0810
parent df304a67ec5c3614b4896598e82201ce39748bb0

Merge branch \'ub-launcher3-burnaby-nyc\' into launcher3merge am: 8c340dff19 am: 908298f567 am: 2aca1b1820 am: 8fd416a7be
am: df304a67ec

Change-Id: I08ca9a1e217d31c1b8bbf2bd1ccf94a7d155ad50

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;