OSDN Git Service

Merge "DisplayCutout: Add emulation option to DeveloperSettings"
authorAdrian Roos <roosa@google.com>
Thu, 18 Jan 2018 17:31:59 +0000 (17:31 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 18 Jan 2018 17:31:59 +0000 (17:31 +0000)
commit27e3e302e7743a52e1ad5f5eaf83a5d4037ba804
tree9de9467788bae45b4f18ba73dfe7c4d2057f7e89
parentb0781fa3a67e4817def023d3de9a5dd0c642b5b4
parentdb9d09793fc186f664fa39f6c76cbd26550b6f0f
Merge "DisplayCutout: Add emulation option to DeveloperSettings"
res/values/strings.xml
res/xml/development_settings.xml
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java