commit cd6eaa88e3790eb2647cc6458fe8826f031a0709
author Tony <twickham@google.com> Fri Jun 09 20:14:08 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 09 20:14:08 2017 +0000
tree a6c88f71108d0d5d1296661fb6c6177dbda23d5e
parent 6fa1298606d3490f644ddd92c1a1a09f04517374
parent df9c1a9990dad31ffbab5bb6ee370a49224f010e

Merge branch 'ub-launcher3-dorval' into launcher3merge am: 7e0801eafb am: 52c656d77c
am: df9c1a9990

Change-Id: I49b5cbbfb8c3fce5642c67e59e36bb90f99429c0

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"
                     }
                 }