Eino-Ville Talvala 5609c1cf0f am 90952cfd: Merge topic \'camera2-remove-hidden\' into lmp-dev ...

* commit '90952cfdb43e769da1a177e294973e3aacca12eb':
  Camera2: Fix session shutdown race, frequent warning log
  Camera2: Remove hidden parts of public CameraDevice
  Camera2: Fix null-listener capture for CameraCaptureSession

2014-08-07 20:20:14 +00:00

..

java

Camera2: Fix session shutdown race, frequent warning log

2014-08-07 13:16:53 -07:00

jni

Remove dependency on SkPaintOptionsAndroid

2014-08-07 14:38:51 -04:00

res

am f9c1251b: Merge "Initial changes to add task affiliation styling. (Bug 16656169)" into lmp-dev

2014-08-07 18:06:38 +00:00

tests

Revert "Revert "Service data and manufacturer data can be repeated fields.""

2014-08-01 11:12:37 -07:00