Tao Bao e810913eea Merge "resolve merge conflicts of 6d8886a to master."

2015-02-12 19:27:34 +00:00

..

java

Merge "resolve merge conflicts of 6d8886a to master."

2015-02-12 19:27:34 +00:00

jni

am f5d30463: am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev

2015-02-12 07:52:49 +00:00

res

Merge "resolve merge conflicts of 6d8886a to master."

2015-02-12 19:27:34 +00:00

tests

am 33d3c53d: resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp

2015-02-11 20:47:31 +00:00