OSDN Git Service

Merge remote-tracking branch 'cm/cm-13.0' into cm-13.0-x86
authorJaap Jan Meijer <jjmeijer88@gmail.com>
Mon, 8 Aug 2016 14:05:54 +0000 (16:05 +0200)
committerJaap Jan Meijer <jjmeijer88@gmail.com>
Mon, 8 Aug 2016 14:05:54 +0000 (16:05 +0200)
commit9da4d0c8e32cf7cd33e47f23a3e98bb973b79a7a
tree638b18ee0bbfd375d8b3a3fc86240775d933f647
parent2dbd0c69ab7607b1e9347613a86805ccbf32d5d9
parent3827d9784da7d74139971100c23dc6156b18b89f
Merge remote-tracking branch 'cm/cm-13.0' into cm-13.0-x86
src/com/android/settings/SettingsActivity.java