diff options
| author | Jeffrey Huang <jeffreyhuang@google.com> | 2017-09-20 20:26:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-09-20 20:26:57 +0000 |
| commit | ff3971038e40182755555b54bf70df922a0914a5 (patch) | |
| tree | 3aa0651c97bc08917c76c11a50e9dd49b068846b /src/com/android/settings/development/LocalTerminalPreferenceController.java | |
| parent | 10ba1f1ee7cb653710fdf0172db33ba868797192 (diff) | |
| parent | 52f4ed8204e818885470a2e169608ecd1cc83ace (diff) | |
Merge changes from topic "OemUnlockPreference"
* changes:
Add comments to avoid merge conflicts
Introduce OemUnlockPreferenceController
Diffstat (limited to 'src/com/android/settings/development/LocalTerminalPreferenceController.java')
0 files changed, 0 insertions, 0 deletions