commit 27e3dc7a6e1a0d916a02e992d381824665e9e5e3
author Hyunyoung Song <hyunyoungs@google.com> Thu Nov 24 02:08:20 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 24 02:08:20 2016 +0000
tree fdd95af92779676d74c0b20470568c1c5b3fba34
parent 90461145d05af44bec791c9e1eb5d308da344291
parent d11580e82d2699b9fdcff00e6185d9e8b4ef68f1

Merge branch \\'ub-launcher3-burnaby-nyc\\' into nyc-dev b/29535844 am: 3c0c2c4b02 am: 027594fc1b am: 9015be72e4 am: a088d2be66
am: d11580e82d

Change-Id: I3ca354a01a91559db39aee7bb9eb1a11035f58bc

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;