OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e140bc3 a03a707)
resolve merge conflicts of a03a707f74 to oc-mr1-dev-plus-aosp
authorMatthew Fritze <mfritze@google.com>
Tue, 1 Aug 2017 00:24:17 +0000 (17:24 -0700)
committerMatthew Fritze <mfritze@google.com>
Tue, 1 Aug 2017 00:24:17 +0000 (17:24 -0700)
commit57b641eee8050c6d30872fbaf464a63270c4c833
treeb75f9e905fa9c6f2117ac46fd330dd1cd0392774tree | snapshot
parente140bc3795abd7b6a9ad700254e5cc34f3906877commit | diff
parenta03a707f744a50626ab07e4b60fcd18cc82cf0fbcommit | diff
resolve merge conflicts of a03a707f74 to oc-mr1-dev-plus-aosp

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