Ruben Brunk 909cfbe062 am ee38cd33: am 3b57d98a: Merge changes Iccd4d53d,Id449bc7a into lmp-dev ...

* commit 'ee38cd33a91f9c153ef2b12d383766a314dfd95a':
  camera2: Avoid setting null metering regions in LEGACY.
  camera2: Fix JPEG orientation set by LEGACY request.

2014-09-22 19:19:39 +00:00

..

java

am 3b57d98a: Merge changes Iccd4d53d,Id449bc7a into lmp-dev

2014-09-22 03:43:23 +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