commit 6fa1298606d3490f644ddd92c1a1a09f04517374
author Tony <twickham@google.com> Fri Jun 09 20:13:49 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 09 20:13:49 2017 +0000
tree a6c88f71108d0d5d1296661fb6c6177dbda23d5e
parent 6bbb28ff402f830e3dfc64e1d84311014c1d9f23
parent 2b63a6210bb2a827e58d554535abd132341a9343

Merge branch 'ub-launcher3-dorval' into launcher3merge am: 7e0801eafb am: 6df10a64d2
am: 2b63a6210b

Change-Id: Ic09d027f74d0eb5232dd1f6e1af34b41c5da91fd

build.gradle

diff --git a/build.gradle b/build.gradle
index 9c71693..4af0e11 100644
--- a/build.gradle
+++ b/build.gradle
@@ -92,6 +92,7 @@
                     remove java
                     javanano {
                         option "java_package=launcher_log.proto|com.android.launcher3.userevent.nano"
+                        option "java_package=launcher_dump.proto|com.android.launcher3.model.nano"
                         option "enum_style=java"
                     }
                 }