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)
commit22f0df3968196c4dfa19fae60220b558bb66481b
treee0dd52e608ae8ee888808aa4af2d10edb33b364b
parent82c039bcfe999551a4a1cc147f6df57bc9b558e6
parent9f629d69804be3e50423e4292858005ad29c6761
Merge "Add ability to switch between support versions"
AndroidManifest.xml
src/com/android/settings/Settings.java
src/com/android/settings/core/gateway/SettingsGateway.java