OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 87275e8 d6d5b46)
am d6d5b46f: am 8c8c82d1: (-s ours) am e21722a3: Merge "Allow carriers to force disab...
authorJack Yu <jackyu@google.com>
Thu, 27 Aug 2015 18:17:52 +0000 (18:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 18:17:52 +0000 (18:17 +0000)
* commit 'd6d5b46f083ff7523b1b383d0e0e3101b1b702ab':


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help