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)
commitb573bc8cf16c8816aada8e45d07918adaafb6866
treebd296e8581993ec4ca6eb4bcb487ec0906c13c8c
parentbc51ac693a4220bb6311b72a144600a107075229
parent43d5629cf3f36ed4120a53f5d1ba0cdf00477c20
Merge remote-tracking branch 'cm/cm-13.0' into cm-13.0-x86
AndroidManifest.xml
src/com/android/settings/DisplaySettings.java