Svetoslav 353e0cf718 am 78a06696: am 90119082: am 358eaa78: am fc1d0471: am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev ...

* commit '78a06696b714dd97076b98a415aadcc174fe3af0':
  PrintSpooler crash if printer is reported to have only one color mode.

2014-03-14 17:53:41 +00:00

..

java

am 78a06696: am 90119082: am 358eaa78: am fc1d0471: am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev

2014-03-14 17:53:41 +00:00

jni

Merge "camera3: Pass vendor tags through binder."

2014-03-13 20:18:37 +00:00

res

resolved conflicts for merge of 4882ddfa to master

2014-03-13 21:26:48 -07:00

tests

Fixes for download manager test.

2014-03-12 18:22:02 -07:00