Marco Nelissen faab8b2313 Fix build ...

Bad automerge

Change-Id: I000a9d3ac2915b3e39d2d34bd52062ac47e9f0fe

2014-03-06 22:19:02 -08:00

..

java/android

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

2014-03-06 20:06:08 +00:00

jni

Fix build

2014-03-06 22:19:02 -08:00

lib

resolved conflicts for merge of e0b14ea7 to master

2013-12-13 15:59:51 -08:00

mca

Resolved conflicts for merge of 28c6ec02 to master

2014-01-16 15:49:59 +00:00

tests

Update framework to use M33 Skia. DO NOT MERGE

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