OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5e888ad 9feab7a)
resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev
authorMatthew Fritze <mfritze@google.com>
Tue, 1 Aug 2017 00:10:24 +0000 (17:10 -0700)
committerMatthew Fritze <mfritze@google.com>
Tue, 1 Aug 2017 00:10:24 +0000 (17:10 -0700)
commita504291eefc8b5d4d8fa5dd4416aa6e5118f3f60
tree0d122f4801d9f32b5dbc1f419c7a4b48f018e381tree | snapshot
parent5e888ad7b6d0870b30cf458cc54ec04a7ae75f76commit | diff
parent9feab7a8a5699b5b0c7793a0c369a201206ff0f3commit | diff
resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I382d6f881cbfebb7692cbe49a14d9a7cc04d824e
src/com/android/settings/search/ResultPayload.java diff1 | diff2 | blob | history
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help