commit 8fd6a3d8e2554308bb08ec80d4e48ab63e925b39
author Dan Willemsen <dwillemsen@google.com> Thu Nov 24 01:58:58 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 24 01:58:58 2016 +0000
tree fdd95af92779676d74c0b20470568c1c5b3fba34
parent 927b6a420fe8929464290ca72283c96ffab88c53
parent 594cf7c4f9742ca584258591646d8dc3cf4d7db9

Merge "Replace custom rules with BUILD_PREBUILT" am: 5892520 am: f9afd3b6cb  -s ours am: 2ba318792f
am: 594cf7c4f9

Change-Id: I9abe9a9c0c5cca6bd625222f81b2c02aef576ec7

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;