OSDN Git Service

resolve merge conflicts of e8411c4454 to master
authorFan Zhang <zhfan@google.com>
Tue, 25 Apr 2017 23:11:04 +0000 (16:11 -0700)
committerFan Zhang <zhfan@google.com>
Tue, 25 Apr 2017 23:16:12 +0000 (16:16 -0700)
commit0576ea48b52a176f16749294550030f167e392fa
treec8c775598f526a607ff31b4424632ab7a2afaf25
parentbd3cbf44acf5b51512383b4fce41c1cc7aa5ba24
parente8411c44540ca5195adf0250cc291be9d35d5a52
resolve merge conflicts of e8411c4454 to master

Test: make RunSettingsRoboTests
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I7575438bf364f3f4a6ea0372e6216fd5d5a5bb69
src/com/android/settings/dashboard/suggestions/SuggestionsChecks.java