OSDN Git Service

resolve merge conflicts of 92f7794d90 to master
authorChristine Franks <christyfranks@google.com>
Wed, 20 Sep 2017 01:23:44 +0000 (18:23 -0700)
committerChristine Franks <christyfranks@google.com>
Wed, 20 Sep 2017 01:24:33 +0000 (18:24 -0700)
commitbfb671391d099cdb39dc2e0191b73834f46da1ec
treecbb95ce50e872e8a643c9c4a93a8edf988e4da39
parent530de5be782d5fc7cb1ddb3b34f2e2cfd2113d4c
parent92f7794d90e6c50a13a7d38a9bfcbcc732957fdf
resolve merge conflicts of 92f7794d90 to master

Test: I solemnly swer I tested this conflict resolution.
Change-Id: I2cbcd06b906904365f9257742ab1c51b67adc3af
src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java