SDK_RK3288

Template

Firefly 166307db44 [packages/apps/Settings] Merge tag 'android-5.1.1_r13' into zjwork

solve merger android-5.1.1_r13 conflict
Android 5.1.1 release 13

Signed-off-by: Firefly <service@t-firefly.com>

Conflicts:
	src/com/android/settings/sim/SimBootReceiver.java

2015-12-31 16:49:37 +08:00

abi/cpp

…

art

[art] ART: Add entries_lock for race condition

2015-12-31 15:57:30 +08:00

bionic

…

bootable/recovery

[bootable/recovery] Track usage of Vector / SortedVector from libutils DO NOT MERGE

2015-12-31 15:57:54 +08:00

build

[build] Merge tag 'android-cts-5.1_r3' into dev

2015-12-31 15:58:57 +08:00

cts

[cts] CTS: check non-zygote apps are not debuggable

2015-12-31 15:59:05 +08:00

dalvik

[dalvik] Ensure deterministic multidex partitioning

2015-12-31 15:59:13 +08:00

developers

…

development

…

device

[device/rockchip/rk3288] modify iso service in init.rc for 3288

2015-12-31 16:05:36 +08:00

docs/source.android.com

…

external

[external/wpa_supplicant_8] Merge tag 'android-5.1.1_r13' into HEAD

2015-12-31 16:10:17 +08:00

frameworks

[frameworks/opt/telephony] Fix NOT_RESTRICTED network capability and enforce it.

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

hardware

[hardware/rockchip/librkvpu] compatible android-m compile

2015-12-31 16:40:26 +08:00

kernel

[kernel] i2c: rockchip: fix power off issue for rk818

2015-12-31 16:44:22 +08:00

libcore

…

libnativehelper

…

ndk

…

packages

[packages/apps/Settings] Merge tag 'android-5.1.1_r13' into zjwork

2015-12-31 16:49:37 +08:00

pdk

…

prebuilts

…

RKDocs

[RKDocs] Add Rockchip_DSS Development GuideV1.2

2015-12-31 15:56:58 +08:00

rkst

…

RKTools

…

sdk

…

system

…

tools/external

…

u-boot

…

vendor

…

.classpath

…

.gitignore

sdk: add .gitignore

2015-08-12 17:49:21 +08:00

build.sh

…

buildspec.mk

…

Makefile

…

manifest.xml

sdk: fix compile error

2015-08-12 17:49:41 +08:00

mkimage.sh

…