OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91fb9b2 6df58d8)
resolve merge conflicts of 6df58d8da10d to oc-dr1-dev
authorfionaxu <fionaxu@google.com>
Fri, 15 Sep 2017 20:52:04 +0000 (13:52 -0700)
committerChen Xu <fionaxu@google.com>
Mon, 18 Sep 2017 17:57:45 +0000 (17:57 +0000)
Test: I solemnly swear I tested this conflict resolution.
Bug: 65113738
Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Merged-in: I445c7bce01e0bf36214f5f4f6327a0582c774dae
Change-Id: I100ef303e5e50ddac12bc2e9f1dbeb21d6b801aa

1  2 
telephony/java/android/telephony/CarrierConfigManager.java patch | diff1 | diff2 | blob | history

frameworks/base
About OSDN
Find Software
Develop Software
Help