OSDN Git Service

Merge "Fix dev settings crash when no OEM unlock service" am: 44cacaa8f1
authorDmitry Shmidt <dimitrysh@google.com>
Thu, 1 Feb 2018 00:29:23 +0000 (00:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 1 Feb 2018 00:29:23 +0000 (00:29 +0000)
commit2ac3120a0161f85daa7a267a4e373373340afb12
tree4abd10b0d80456268852ac935dd11518aaffb229
parentb9af110c03ba6b2f2033a8c747d878083ee3a26b
parentf6d960ac31214343309807d1d00bdcc05c9ce31b
Merge "Fix dev settings crash when no OEM unlock service" am: 44cacaa8f1
am: f6d960ac31

Change-Id: I536daa3948be136524e35e35448df09eaa6ad9da
src/com/android/settings/development/DevelopmentSettings.java