commit 3148d486e45f1a27caa8a091e51e9ae7095baeb9
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 17 21:01:15 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 17 21:01:18 2017 +0000
tree 3f9f59beea6747bbb3def88d0eb2e93fbebef603
parent 1df3cac94c608983f40fdb3471b32ee704706e37
parent 508c8f3ac8e5bc4d1f753f1dc3b7a8cb8e351292

Merge changes from topic 'am-ab6fc536-0646-4c6c-ae5a-3c2749ab079f' into ub-launcher3-master

* changes:
  When building Launcher3 target, LauncherDumpProto class should not be proguarded b/36904684 am: 2d4d1c532d
  When building Launcher3 target, LauncherDumpProto class should not be proguarded b/36904684

proguard.flags

diff --git a/proguard.flags b/proguard.flags
index 2ad9cac..51abcca 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -98,3 +98,7 @@
 -keep interface com.android.launcher3.userevent.nano.LauncherLogProto.** {
   *;
 }
+
+-keep interface com.android.launcher3.model.nano.LauncherDumpProto.** {
+  *;
+}