OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 95a0c7c) | patch
resolve merge conflicts of 68514d5325 to master.
authorPavel Zhamaitsiak <pavelz@google.com>
Wed, 13 Jan 2016 00:03:04 +0000 (00:03 +0000)
committerPavel Zhamaitsiak <pavelz@google.com>
Wed, 13 Jan 2016 00:08:41 +0000 (00:08 +0000)
commitcef504f9142db0b92b34578e22c689ef53135210
tree305b145b40041c1541a2f3d9e154fba173c41084tree | snapshot
parent95a0c7c8e63ab0a53ba1b225effe593c71b9ddb7commit | diff
resolve merge conflicts of 68514d5325 to master.

Change-Id: Ifbd3766e8a799a72e49adcdc6c5d509f2b8b53a6
telephony/java/android/telephony/CarrierConfigManager.java diff | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help