OSDN Git Service

Merge remote-tracking branch 'cm/cm-13.0' into cm-13.0-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 21 Sep 2016 05:32:00 +0000 (13:32 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 21 Sep 2016 05:32:00 +0000 (13:32 +0800)
commitc3b0f60dc256aaa5129e9149161bfdd7ecdd1196
tree35b3cfeb9fbbf9fe9e5b2f7794783a988b0635e4
parentb45942bb7049e1a95d0093fa810010e2741bf082
parent4b03da7757caf8a0dff2864ab6a2fac3afd91e39
Merge remote-tracking branch 'cm/cm-13.0' into cm-13.0-x86
src/com/android/settings/DeviceInfoSettings.java