|
|
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 |
|
