OSDN Git Service

Merge "Add ability to switch between support versions"
authorAndrew Sapperstein <asapperstein@google.com>
Mon, 1 May 2017 22:37:28 +0000 (22:37 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 1 May 2017 22:37:32 +0000 (22:37 +0000)
1  2 
AndroidManifest.xml
src/com/android/settings/Settings.java
src/com/android/settings/core/gateway/SettingsGateway.java

Simple merge