commit b406f8171435552f24289a388ca6dea0b1728d9c
author Ed Tam <etam@google.com> Thu Nov 24 01:59:32 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 24 01:59:32 2016 +0000
tree fdd95af92779676d74c0b20470568c1c5b3fba34
parent 94878c3099fc2c8e50608b3083936417b6e4f7ce
parent e30d79650b475aefbb5cef576032ac2b5250c2ca

Merge "Fix RecyclerView resource path am: 43d0156 am: a6fb1e6" into nyc-mr1-dev-plus-aosp am: 529970a1d6 am: 55fac8f48d
am: e30d79650b

Change-Id: Ie5c7eaa5225266bff0f63f1a47f0ce6f18dce6ca

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;