OSDN Git Service

Merge "Revert "Development Options: toggle binderized hals"" am: 21de66bc0c am: 68b58...
authorSteven Moreland <smoreland@google.com>
Tue, 28 Mar 2017 01:27:24 +0000 (01:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Mar 2017 01:27:24 +0000 (01:27 +0000)
commit20f9ab272aa6e9de1730802a51bf8f8b54996478
tree8a15d2dea10ffdb64dbc71d69fe3d6f2673dd0f6
parentf85ebb24bb4f94665f431f78aa4be4665ccf4b25
parentefb7925e7a0fabf878fab14c21ea5914af10fed1
Merge "Revert "Development Options: toggle binderized hals"" am: 21de66bc0c am: 68b580f346
am: efb7925e7a

Change-Id: I0d97c4ecfb4cd04ee0a19468c0c8382e61f4ae79
res/values/strings.xml
res/xml/development_prefs.xml
src/com/android/settings/development/DevelopmentSettings.java