Eino-Ville Talvala f4de8dd77c Merge changes I069e2b7e,Ic5e9e58a into nyc-dev ...

* changes:
  Camera2: Fix error codes for CameraDevice.StateCallback.onError()
  Camera2: Protect MarshalRegistry against concurrent access

2016-06-10 19:44:04 +00:00

..

android

Merge changes I069e2b7e,Ic5e9e58a into nyc-dev

2016-06-10 19:44:04 +00:00

com

Merge "BatteryStats: Record fine grained battery discharge" into nyc-dev

2016-06-10 02:12:23 +00:00

org/apache/http

…

jarjar-rules.txt

…

overview.html

…