OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 10ba1f1 52f4ed8)
Merge changes from topic "OemUnlockPreference"
authorJeffrey Huang <jeffreyhuang@google.com>
Wed, 20 Sep 2017 20:26:57 +0000 (20:26 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 20 Sep 2017 20:26:57 +0000 (20:26 +0000)
* changes:
  Add comments to avoid merge conflicts
  Introduce OemUnlockPreferenceController


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