commit 927b6a420fe8929464290ca72283c96ffab88c53
author Dmitry Kalita <rusmonster@gmail.com> Thu Nov 24 01:49:59 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 24 01:49:59 2016 +0000
tree fdd95af92779676d74c0b20470568c1c5b3fba34
parent f4f62cfb2d93637880279a7eb5b9ce2f6bddce82
parent 8267b109552460025be1ec3f004e45dfb467ce4b

Merge "Fix restoring of layer type" am: 0b28b42 am: 8ce0be3353  -s ours am: 64ac4368c6
am: 8267b10955

Change-Id: Ic0084a6a2694b220867f26e18c1294f7b720e703

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;