gaoyang3513/SDK_RK3288
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
9d1439773f9708bffe67b8bcdeae0eb96ba71a9b
SDK_RK3288/external
History
cjp 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
..
aac
[external/aac] Fix crash on invalid channel config
2015-12-31 16:05:44 +08:00
android-clat
…
ant-glob
…
antlr
…
apache-harmony
…
apache-http
…
apache-xml
…
arduino
…
bison
…
blktrace
…
bluetooth/bluedroid
[external/bluetooth/bluedroid] DO NOT MERGE - Add proper checks for PAN & BNEP in BD stack
2016-05-23 20:15:28 +08:00
bluetooth_bplus/bluedroid
…
bluetooth_rtk/bluedroid
[external/bluetooth_rtk/bluedroid] fix can't support RTL8723AU
2015-12-31 16:05:52 +08:00
bouncycastle
[external/bouncycastle] DO NOT MERGE bouncycastle: limit input length as specified by the NIST spec
2016-05-23 20:15:39 +08:00
broadcom_bplus
…
bsdiff
…
busybox
…
bzip2
…
ceres-solver
…
checkpolicy
…
chromium_org
sdk: fix chromium_org compile error
2015-08-12 17:49:31 +08:00
chromium-libpac
…
chromium-trace
…
clang
…
cmockery/cmockery_0_1_2
…
compiler-rt
…
conscrypt
[external/conscrypt] Prevent duplicate certificates in TrustedCertificateIndex
2016-05-23 20:15:57 +08:00
deqp
…
dexmaker
…
dhcpcd
…
dnsmasq
…
doclava
…
droiddriver
…
e2fsprogs
…
easymock
…
eclipse-basebuilder
…
eclipse-windowbuilder/propertysheet
…
eigen
…
elfutils
…
emma
…
esd
…
expat
…
eyes-free
…
f2fs-tools
…
fdlibm
…
fio
…
flac
…
fonttools
…
freetype
…
fsck_msdos
…
gcc-demangle
…
genext2fs
…
giflib
…
glide
…
google-diff-match-patch
…
google-fonts
…
google-tv-pairing-protocol
…
gtest
…
guava
…
hamcrest
…
harfbuzz_ng
…
icu
…
io
…
iproute2
…
ipsec-tools
…
iptables
…
iputils
…
jarjar
…
javasqlite
…
javassist
…
jdiff
…
jemalloc
…
jhead
…
jmdns
…
jpeg
…
jsilver
…
jsmn
…
jsoncpp
…
jsr305
…
junit
…
kernel-headers
…
ksoap2
…
libcap-ng
…
libcxx
…
libcxxabi
…
libedit
…
libexif
…
libgsm
…
libhevc
[external/libhevc] Fix the frame size alignments
2016-05-23 20:16:21 +08:00
liblzf
…
libmtp
…
libnfc-nci
…
libnfc-nxp
…
libnl
…
libogg
…
libopus
…
libpcap
…
libphonenumber
…
libpng
…
libselinux
[external/libselinux] sofia3gr:change ptest sepolicy file name from ptestsepolicy to sepolicy.ptest
2015-12-31 16:06:08 +08:00
libsepol
…
libunwind
…
libusb
…
libusb-compat
…
libutf
…
libvorbis
…
libvpx
[external/libvpx] From 0de669f1ab8d6119d7c58d07585af3adbd31ebd9 Mon Sep 17 00:00:00 2001
2016-05-23 20:16:39 +08:00
libvterm
…
libxml2
…
libyuv
…
linux-tools-perf
…
littlemock
…
lldb
…
llvm
…
lohit-fonts
…
ltrace
…
lzma
…
mac
…
markdown
…
mdnsresponder
…
mesa3d
…
mksh
…
mmc-utils
…
mockito
…
mockwebserver
…
mp4parser
…
mtpd
…
nanohttpd
…
nanopb-c
…
naver-fonts
…
netcat
…
netperf
…
neven
…
nfacct
…
nist-pkits
…
nist-sip
…
noto-fonts
…
ntfs-3g
[external/ntfs-3g] fix:android 6.0 can not mount dev path like 'public:8,1'
2016-05-23 20:16:50 +08:00
oauth
…
objenesis
…
okhttp
…
opencv
…
openfst
…
openssl
…
oprofile
…
owasp/sanitizer
…
pcre
…
pdfium
…
pixman
…
ppp
…
proguard
…
protobuf
…
qemu
…
qemu-pc-bios
…
regex-re2
…
replicaisland
…
rk-pcba-test
[external/rk-pcba-test] pcba: link with libutils static
2016-05-23 20:19:17 +08:00
robolectric
…
rp-pppoe
…
safe-iop
…
scrypt
…
sepolicy
Android->DeviceTest:fix save log support
2016-02-23 16:24:44 +08:00
sfntly
…
skia
[external/skia] Purge non-NEON ARM code. DO NOT MERGE
2016-05-23 20:19:29 +08:00
smack
…
smali
…
sonivox
[external/sonivox] Sonivox: check loopStart/loopLength against one specific wave, not whole wave pool.
2015-12-31 16:09:53 +08:00
speex
…
sqlite
[external/sqlite] sqlite: upgrade to SQLite 3.8.6.1 - DO NOT MERGE
2015-12-31 16:10:01 +08:00
srec
…
srtp
…
stlport
…
strace
…
stressapptest
…
svox
…
tagsoup
…
tcpdump
…
timezonepicker-support
…
tinyalsa
…
tinycompress
…
tinyxml
…
tinyxml2
…
tremolo
[external/tremolo] Subject: [PATCH] libvorbisidec: sanity check index of marker.
2015-12-31 16:10:09 +08:00
valgrind
…
vixl
…
webp
…
webrtc
…
wlan_loader
…
wpa_supplicant_8
[external/wpa_supplicant_8] WNM: Ignore Key Data in WNM Sleep Mode Response frame if no PMF in use
2016-05-23 20:19:41 +08:00
wpa_supplicant_8_esp
…
wpa_supplicant_8_rtl
…
xmlwriter
…
xmp_toolkit
…
yaffs2
…
zlib
…
zopfli
…
zxing
…