djw 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

..

protos

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

res

Merge master branch.

2015-12-31 17:54:05 +08:00

src

[packages/apps/Launcher3] fix Launcher rotation error

2015-12-31 16:46:39 +08:00

tests

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

util

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

WallpaperPicker

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

.gitignore

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

Android.mk

[packages/apps/Launcher3] 1.don't use system uid for launcher3

2015-12-31 16:46:31 +08:00

AndroidManifest.xml

[packages/apps/Launcher3] 1.don't use system uid for launcher3

2015-12-31 16:46:31 +08:00

CleanSpec.mk

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

fill_screens.py

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

MODULE_LICENSE_APACHE2

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

NOTICE

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

print_db.py

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

proguard.flags

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

update_gallery_files.py

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

update_system_wallpaper_cropper.py

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00