diff options
| author | Wenyi Wang <wenyiw@google.com> | 2016-09-13 21:50:47 -0700 |
|---|---|---|
| committer | Wenyi Wang <wenyiw@google.com> | 2016-09-13 23:05:14 -0700 |
| commit | 60ca24d89fea34b1b7b8f4a4bc53ffaa3adfbcc3 (patch) | |
| tree | 05b952b1f48ad4a142c17b57180f6429a00c22a4 /src-bind | |
| parent | 6fa5e1718008b6296310ab9713b4fbf85180c54d (diff) | |
| parent | 51819e8072cc7c01f704fab1d19b9bc359e7d528 (diff) | |
| download | Contacts-60ca24d89fea34b1b7b8f4a4bc53ffaa3adfbcc3.tar.gz | |
resolve merge conflicts of 51819e8 to master
Change-Id: Ic4ca267c2f2726763aba2921940f4d8d32d3eb14
Diffstat (limited to 'src-bind')
| -rw-r--r-- | src-bind/com/android/contactsbind/FeatureHighlightHelper.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src-bind/com/android/contactsbind/FeatureHighlightHelper.java b/src-bind/com/android/contactsbind/FeatureHighlightHelper.java index c2461413f..be1833d67 100644 --- a/src-bind/com/android/contactsbind/FeatureHighlightHelper.java +++ b/src-bind/com/android/contactsbind/FeatureHighlightHelper.java @@ -26,4 +26,8 @@ public final class FeatureHighlightHelper { public static boolean showHamburgerFeatureHighlight(final FragmentActivity activity) { return false; } + + public static boolean tryRemoveHighlight(final FragmentActivity activity) { + return false; + } } |