Narayan Kamath 948682d15f am 6e208cdd: Merge "Remove wrong javadoc comment" ...

* commit '6e208cddad3315c4e38accdb801908b2b9b5cbbd':
  Remove wrong javadoc comment

2015-02-24 10:11:52 +00:00

..

java

am 6e208cdd: Merge "Remove wrong javadoc comment"

2015-02-24 10:11:52 +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 05:54:34 +00:00

res

Merge commit '32acf753e8989766f67fd5300d3eb467f707cc79' into HEAD

2015-02-19 14:31:36 -08:00

tests

resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp

2015-02-11 12:37:12 -08:00