OSDN Git Service

Merge remote-tracking branch 'cm/cm-14.1' into cm-14.1-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 20 May 2020 13:48:00 +0000 (21:48 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 20 May 2020 13:48:00 +0000 (21:48 +0800)
commitc92ac15e06b042383a454669f2b39f33a3a724a2
treefda6d1238f7a2a63392b05964a48e8f4baf8ba1a
parent5fca2016fee019bfa142e8397f9b269d506abee2
parentb2087715acf8f2e2a8267487a7a93daeb0355f14
Merge remote-tracking branch 'cm/cm-14.1' into cm-14.1-x86
src/com/android/settings/SettingsActivity.java