Eino-Ville Talvala 42b53cc1fc Merge "Camera2: Unlink camera device death listener on disconnect" into nyc-dev ...

am: 2a6f476

* commit '2a6f4768366b78965326710410fe938644feb60d':
  Camera2: Unlink camera device death listener on disconnect

Change-Id: Iddfc98e8d4aa699f1411d609589d729e323fb994

2016-04-05 23:25:27 +00:00

..

java

Merge "Camera2: Unlink camera device death listener on disconnect" into nyc-dev

2016-04-05 23:25:27 +00:00

jni

Merge "Downgrades error messages about not being able to detect whether we are in protected mode or not to informational messages. If there is no GL context, then we are by definition not in protected mode, and still return false as advertised, thus there\'s no need for an error message." into nyc-dev

2016-04-05 23:25:24 +00:00

res

Merge "Split ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED into two." into nyc-dev

2016-04-05 14:56:44 +00:00

tests

Merge "Have the NetworkScoreService bind to the scorer." into nyc-dev

2016-04-05 23:25:18 +00:00