OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c6d540 eb0d3b7)
am eb0d3b7c: am fad2b09d: Merge "Disable disable button according to user restriction...
authorJulia Reynolds <juliacr@google.com>
Fri, 15 Aug 2014 21:16:59 +0000 (21:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 Aug 2014 21:16:59 +0000 (21:16 +0000)
* commit 'eb0d3b7cd02ac8d89b52d26f495ade11bc85c364':
  Disable disable button according to user restrictions.


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help