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)
commit7f7092c70512b24c1b640a8a039e89112ec31e12
treebe23c23dea2cbe9d0516a5cb4144b6262472d236
parentcb1972b9080c464e06ef82baa062f51e381a3430
parentb7e4380cd27ffd8a060ecb61201057fb6843e408
Merge "Remove PreferenceActivity" into nyc-dev
AndroidManifest.xml
src/com/android/settings/SettingsActivity.java