Firefly b4857f4858 [external/libvpx] From 0de669f1ab8d6119d7c58d07585af3adbd31ebd9 Mon Sep 17 00:00:00 2001 ...

From: Firefly <service@t-firefly.com>
Date: Tue, 19 Jan 2016 11:05:09 -0800
Subject: [PATCH 2/2] Merge Conflict Fix CL to lmp-mr1-release for ag/849478

DO NOT MERGE - libvpx: Pull from upstream

Current HEAD: 7105df53d7dc13d5e575bc8df714ec8d1da36b06

BUG=23452792

Change-Id: Ic78176fc369e0bacc71d423e0e2e6075d004aaec

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

2016-05-23 20:16:39 +08:00

..

armv7a

[external/libvpx] From 0de669f1ab8d6119d7c58d07585af3adbd31ebd9 Mon Sep 17 00:00:00 2001

2016-05-23 20:16:39 +08:00

armv7a-neon

[external/libvpx] From 0de669f1ab8d6119d7c58d07585af3adbd31ebd9 Mon Sep 17 00:00:00 2001

2016-05-23 20:16:39 +08:00

generic

[external/libvpx] From 0de669f1ab8d6119d7c58d07585af3adbd31ebd9 Mon Sep 17 00:00:00 2001

2016-05-23 20:16:39 +08:00

libvpx

[external/libvpx] From 0de669f1ab8d6119d7c58d07585af3adbd31ebd9 Mon Sep 17 00:00:00 2001

2016-05-23 20:16:39 +08:00

libwebm

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

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

mips

[external/libvpx] From 0de669f1ab8d6119d7c58d07585af3adbd31ebd9 Mon Sep 17 00:00:00 2001

2016-05-23 20:16:39 +08:00

mips-dspr2

[external/libvpx] From 0de669f1ab8d6119d7c58d07585af3adbd31ebd9 Mon Sep 17 00:00:00 2001

2016-05-23 20:16:39 +08:00

x86

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

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

0001-Try-to-CP-ag-749963-from-klp-dev-into-lmp-mr1-releas.patch

[external/libvpx] From 0de669f1ab8d6119d7c58d07585af3adbd31ebd9 Mon Sep 17 00:00:00 2001

2016-05-23 20:16:39 +08:00

0002-Merge-Conflict-Fix-CL-to-lmp-mr1-release-for-ag-8494.patch

[external/libvpx] From 0de669f1ab8d6119d7c58d07585af3adbd31ebd9 Mon Sep 17 00:00:00 2001

2016-05-23 20:16:39 +08:00

Android.mk

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

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

config.arm64.mk

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

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

config.arm.mk

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

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

config.mips64.mk

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

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

config.mips.mk

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

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

config.x86_64.mk

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

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

config.x86.mk

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

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

libvpx-offsets.mk

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

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

libvpx.mk

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

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

libwebm.mk

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

UPDATING

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

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