|
|
ec5e22c526
|
Merge branch 'rockchip_master' into firefly-git
Conflicts:
frameworks/base/packages/SystemUI/res/layout-sw720dp/navigation_bar_win.xml
frameworks/base/packages/SystemUI/res/layout-sw800dp/navigation_bar_win.xml
frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
hardware/rockchip/camera/Config/cam_board_rk3288.xml
hardware/rockchip/camera/SiliconImage/isi/drv/TC358749XBG_MIPI_YUV/Android.mk
hardware/rockchip/camera/SiliconImage/isi/drv/TC358749XBG_MIPI_YUV/include_priv/TC358749XBG_priv.h
hardware/rockchip/camera/SiliconImage/isi/drv/TC358749XBG_MIPI_YUV/source/TC358749XBG_PARREL.c
hardware/rockchip/camera/SiliconImage/isi/drv/TC358749XBG_MIPI_YUV/source/TC358749XBG_tables.c
kernel/drivers/video/rockchip/Kconfig
kernel/drivers/video/rockchip/Makefile
packages/apps/Settings/res/values/strings.xml
packages/apps/Settings/src/com/android/settings/dualscreen/DualscreenSettings.java
|
2016-07-08 11:57:40 +08:00 |
|
|
|
c36ad6843e
|
[build] Updating security patch string to 2016-03-01
b/26499556
Change-Id: I18a5ad9d8d08e2050053bcebc1a9a0c46db86733
(cherry picked from commit c24c6ccd4d5de8be010b74b9021b8fdb926e1dad)
|
2016-05-23 20:14:44 +08:00 |
|
|
|
7778a1920b
|
[build] DO NOT MERGE - Update security string to 2016-02-01
b/26110717
Change-Id: Ifbb78b8c7cd5d2efa9e5501fc4e7216f336ccadc
(cherry picked from commit 929a4abd2b777715bc730593aee87643a30706d6)
Signed-off-by: Firefly <service@t-firefly.com>
|
2016-05-23 20:14:38 +08:00 |
|
|
|
6f29f46b8c
|
[build] Merge tag 'android-5.1.1_r33'
Android 5.1.1 release 33
Conflicts:
core/version_defaults.mk
|
2016-05-23 20:14:31 +08:00 |
|
|
|
a4e5f4d52b
|
[build] From: Firefly <service@t-firefly.com>
Date: Thu, 22 Oct 2015 15:00:30 -0700
Subject: [PATCH] Update security string to 2015-12-01 - DO NOT MERGE
Change-Id: I155ec6c2b57c899f20bb85f5a5cf031499ba81b0
(cherry picked from commit 6575d4a2a8c78a703e5c2e2889ecb358668d1bbd)
Signed-off-by: Firefly <service@t-firefly.com>
|
2016-05-10 15:50:48 +08:00 |
|
|
|
62228cc01c
|
[build] Makefile: fix pcba build error
Signed-off-by: Firefly <service@t-firefly.com>
|
2016-05-10 15:50:41 +08:00 |
|
|
|
9c35816c39
|
[build] Revert "Support build without DEBUG,"
This reverts commit 9460e5587a82540ebcb70924abec92efdab1ca9e.
|
2016-05-10 15:50:34 +08:00 |
|
|
|
900294628a
|
[build] Update Security String to 2016-01-01 - DO NOT MERGE
http://b/25819582
Change-Id: I99d8ca004bb5d35613f3a2314597717f6b7c04c7
Signed-off-by: Firefly <service@t-firefly.com>
|
2016-05-10 15:50:28 +08:00 |
|
|
|
3cf14afe45
|
[build] Merge tag 'android-cts-5.1_r4' into dev
Android CTS 5.1 release 4
Conflicts:
core/version_defaults.mk
|
2016-05-10 15:50:22 +08:00 |
|
|
|
bc998ac190
|
[build] sofia3gr: config default target for 2ndbootloader and 3ndbootloader
Signed-off-by: Firefly <service@t-firefly.com>
|
2016-05-10 15:50:15 +08:00 |
|
|
|
e93ebb2cb1
|
[build] Config PATH for 2ndbootloader and 3ndbootloader to pack images correctly
To pack dtb to boot.img and recovery.img correctly
Signed-off-by: Firefly <service@t-firefly.com>
|
2016-05-10 15:50:09 +08:00 |
|
|
|
440d3c0a15
|
[build] wifionly: add dongle building support
Signed-off-by: Firefly <service@t-firefly.com>
|
2016-05-10 15:50:03 +08:00 |
|
|
|
4c5d382320
|
[build] Update security string to 2015-12-01 - DO NOT MERGE
Change-Id: I155ec6c2b57c899f20bb85f5a5cf031499ba81b0
(cherry picked from commit 6575d4a2a8c78a703e5c2e2889ecb358668d1bbd)
|
2016-05-10 15:49:57 +08:00 |
|
|
|
78e7ce5d90
|
Android->system: modify device name to firefly
|
2016-01-05 11:49:55 +08:00 |
|
|
|
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 |
|
|
|
2572814bd4
|
[build] Merge tag 'android-cts-5.1_r3' into dev
Android CTS 5.1 release 3
Conflicts:
core/build_id.mk
|
2015-12-31 15:58:57 +08:00 |
|
|
|
60b1e2f429
|
[build] Revert "Fix dependency error for dex2oat"
This reverts commit 857b24a0e517555a6ea299b511ac4700894061fb.
|
2015-12-31 15:58:49 +08:00 |
|
|
|
1ffbd909c6
|
[build] DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
b/23946860
Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3
(cherry picked from commit 47ef4c3467e4f895b776fb0e8dbcba8f90a9398c)
|
2015-12-31 15:58:41 +08:00 |
|
|
|
ba128f57bc
|
[build] Fix dependency error for dex2oat
Signed-off-by: Firefly <service@t-firefly.com>
|
2015-12-31 15:58:34 +08:00 |
|
|
|
1b3521e179
|
[build] OTA: add trust.img update support for RK
if trust.img exist in u-boot dir
|
2015-12-31 15:58:26 +08:00 |
|
|
|
b33f85cdf8
|
[build] ota: Allow system images larger than 2GiB.
|
2015-12-31 15:58:18 +08:00 |
|
|
|
146aca0162
|
[build] Merge tag 'android-cts-5.1_r2'
Android CTS 5.1 release 2
|
2015-12-31 15:58:10 +08:00 |
|
|
|
45efc9132d
|
[build] sofia3gr: fix ota increment package error.
|
2015-12-31 15:58:02 +08:00 |
|
|
|
254f5ecc50
|
A->build:moidfy brand
|
2015-09-08 17:10:32 +08:00 |
|
|
|
7fa7bca412
|
A->base:add base firefly setting
|
2015-09-08 17:10:05 +08:00 |
|
|
|
3f8870a135
|
Commit of manifest rk3288_box_lollipop_release.xml
|
2015-08-11 11:01:11 +08:00 |
|
|
|
93013a6efc
|
Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml
|
2015-05-20 17:06:22 +08:00 |
|
