Leon Scroggins III e648c19bf3 resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp ...

Change-Id: If2855ff4f7a1e7645c69af378955868f44187376

2014-03-06 20:10:19 -05:00

..

java/android

am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev

2014-03-06 20:05:33 +00:00

jni

Merge "Release locked buffer when it fails to acquire graphics buffer"

2014-01-30 23:01:21 +00:00

lib

Use java.util.Objects instead on internal API

2013-12-13 13:40:30 -08:00

mca

AArch64: Use long for pointers in media classes

2014-01-15 13:09:27 +00:00

tests

Update framework to use M33 Skia. DO NOT MERGE

2014-03-06 12:14:47 -05:00