Ruben Brunk ee99c63f75 am 252bfab5: am 6a80927a: Merge "camera2: refactor LEGACY mode error handling." into lmp-dev ...

* commit '252bfab5897109603cd009e9cb8a73e0622c2a10':
  camera2: refactor LEGACY mode error handling.

2014-09-22 19:18:56 +00:00

..

java

am 6a80927a: Merge "camera2: refactor LEGACY mode error handling." into lmp-dev

2014-09-21 19:25:56 +00:00

jni

am ad421a8b: am 52e5e359: Merge "USB string descriptors are not UTF8, so it is not safe to treat them as such." into lmp-dev

2014-09-19 05:35:07 +00:00

res

Import translations. DO NOT MERGE

2014-09-20 13:52:17 -07:00

tests

NetworkStats always needs arrays.

2014-09-17 09:26:31 -07:00