OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c26ae06) | patch
resolve merge conflicts of 31a2f413f8 to master
authordaqi <daqi@xiaomi.com>
Sat, 17 Jun 2017 07:24:44 +0000 (15:24 +0800)
committerFan Zhang <zhfan@google.com>
Mon, 26 Jun 2017 22:04:15 +0000 (15:04 -0700)
commitba3c8edc2ff9e1449d7392bc9ce80e0ca1074007
treebe5d5da7111ee233e0ec43fd2e16cfe93c6bd63ftree | snapshot
parentc26ae0677ed209e17af5b63235ddcd5f1d0fd183commit | diff
resolve merge conflicts of 31a2f413f8 to master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2d665a710a58d9e18d56517bffb69f42b9ffe7a6
src/com/android/settings/applications/PremiumSmsAccess.java diff | blob | history
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help