|
|
2b5f44213a
|
Merge master branch.
Conflicts:
frameworks/base/core/java/android/content/res/Configuration.java
frameworks/base/core/java/android/provider/Settings.java
frameworks/base/packages/SettingsProvider/res/values/defaults.xml
frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/SystemBars.java
frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
frameworks/base/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
frameworks/base/services/core/java/com/android/server/wm/WindowManagerService.java
hardware/rockchip/camera/CameraHal/CameraHal_board_xml_parse.cpp
vendor/rockchip/common/apps/apps.mk
|
2015-12-31 17:54:05 +08:00 |
|
|
|
7cd2eb335b
|
[system/displayd] aux display resolution set by android
Signed-off-by: Firefly <service@t-firefly.com>
|
2015-12-31 16:53:18 +08:00 |
|
|
|
f6d3ce6476
|
[system/displayd] modify process, avoid being closed and reopen when CVBS display
Signed-off-by: Firefly <service@t-firefly.com>
|
2015-12-31 16:53:10 +08:00 |
|
|
|
ded6e6f7c7
|
A->framwork:make vga and hdmi switch function
|
2015-08-20 15:20:45 +08:00 |
|
|
|
93013a6efc
|
Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml
|
2015-05-20 17:06:22 +08:00 |
|
