OSDN Git Service

Merge "Use GoogleSetting to override DRP setting if available" into lmp-dev
authorSelim Gurun <sgurun@google.com>
Thu, 28 Aug 2014 22:11:45 +0000 (22:11 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 28 Aug 2014 22:11:46 +0000 (22:11 +0000)
commitd578fc00b57c5d8d7122bb25d122e24779669fdb
tree2ce5a9ba2ee7ddcd13aa5a532c00bcb0a416fb8b
parent7e392fd59a9fcc89121148cb69c12a787683959c
parentb56bab1fd4ada2b930009e43e2b03ace59c66f58
Merge "Use GoogleSetting to override DRP setting if available" into lmp-dev
res/values/strings.xml
src/com/android/settings/DevelopmentSettings.java