OSDN Git Service

Merge "Remove PreferenceActivity" into nyc-dev
authorJason Monk <jmonk@google.com>
Wed, 8 Jun 2016 19:13:05 +0000 (19:13 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 8 Jun 2016 19:13:05 +0000 (19:13 +0000)
1  2 
AndroidManifest.xml
src/com/android/settings/SettingsActivity.java

Simple merge