diff options
| author | Wenyi Wang <wenyiw@google.com> | 2017-01-09 13:04:48 -0800 |
|---|---|---|
| committer | Wenyi Wang <wenyiw@google.com> | 2017-01-09 13:05:43 -0800 |
| commit | 92f02b80dccc23b3ea2dca22c96058da535ef3ff (patch) | |
| tree | 844fc7a88e598ee130af3d05e9971701d8033784 /src-bind | |
| parent | cf61e4f3c9a77abb8181ebd2c3743585d6ed749b (diff) | |
| parent | 2829deb584a17106ee8e56c8c0bf4f509774ee4a (diff) | |
| download | Contacts-92f02b80dccc23b3ea2dca22c96058da535ef3ff.tar.gz | |
resolve merge conflicts of 2829deb58 to master
Test: build locally
Change-Id: I37187546adacb8431143a9cafd745ca09137d972
Diffstat (limited to 'src-bind')
| -rw-r--r-- | src-bind/com/android/contactsbind/ObjectFactory.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src-bind/com/android/contactsbind/ObjectFactory.java b/src-bind/com/android/contactsbind/ObjectFactory.java index 5fbab3eea..e8b9cebb1 100644 --- a/src-bind/com/android/contactsbind/ObjectFactory.java +++ b/src-bind/com/android/contactsbind/ObjectFactory.java @@ -41,4 +41,8 @@ public class ObjectFactory { public static Intent getContactSheetIntent(Context context, Uri contactLookupUri) { return null; } + + public static Uri getWelcomeUri() { + return null; + } } |