Jeremy Joslin f69f3737ba am 1267462c: am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev ...

* commit '1267462c0bf8ef5a0cfaca535847fc962b2cf32e':
  Update Javadoc for EXTRA_NETWORK.

2015-02-12 18:56:35 +00:00

..

java

am 1267462c: am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev

2015-02-12 18:56:35 +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

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

2015-02-11 22:32:05 -08:00

tests

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

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