Dan Albert b7121d7030 am b78cce6f: Merge "Update autogenerated gl functions." ...

* commit 'b78cce6f92e38b57a6a56183cdbafc054c5758fe':
  Update autogenerated gl functions.

2015-02-25 23:00:52 +00:00

..

java

am 6e208cdd: Merge "Remove wrong javadoc comment"

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

jni

am b78cce6f: Merge "Update autogenerated gl functions."

2015-02-25 23:00:52 +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