OSDN Git Service

Merge remote-tracking branch 'cm/cm-13.0' into cm-13.0-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Mon, 16 Jan 2017 15:28:31 +0000 (23:28 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Mon, 16 Jan 2017 15:28:31 +0000 (23:28 +0800)
1  2 
AndroidManifest.xml
src/com/android/settings/DisplaySettings.java

Simple merge