OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 83923e5 7d59c48)
resolve merge conflicts of 7d59c480385fe772f9e2f53e2a94184127dcec0c to qt-dev-plus...
authorJordan Liu <jminjie@google.com>
Fri, 5 Apr 2019 20:31:11 +0000 (13:31 -0700)
committerJordan Liu <jminjie@google.com>
Fri, 5 Apr 2019 20:31:11 +0000 (13:31 -0700)
commit3a4412ff41353a95d11409f594e2140bf229b5e3
tree1eece3eb2d1d30486a1805ed0d7e5cd217d6095dtree | snapshot
parent83923e5cf01e33ebde3ac5b245bf457c5ae35b61commit | diff
parent7d59c480385fe772f9e2f53e2a94184127dcec0ccommit | diff
resolve merge conflicts of 7d59c480385fe772f9e2f53e2a94184127dcec0c to qt-dev-plus-aosp

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ida3890ed8a15cd50cc993fc9e5e0dd5976088cd3
res/layout/radio_info.xml diff1 | diff2 | blob | history
res/values/strings.xml diff1 | diff2 | blob | history
src/com/android/settings/RadioInfo.java diff1 | diff2 | blob | history
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help