Ruben Brunk 1bc109b928 am 8f8dc488: resolve merge conflicts of 0f647c1 to lmp-mr1-dev-plus-aosp. ...

* commit '8f8dc4882bc61b7e273ac991e2ae99834d55b7d0':
  Camera2: Fix early EOF in DngCreator#writeByteBuffer.

2015-01-10 01:24:55 +00:00

..

java

Merge "Support for simultaneous USB Audio Devices connect/disconnect"

2015-01-09 23:12:37 +00:00

jni

am 8f8dc488: resolve merge conflicts of 0f647c1 to lmp-mr1-dev-plus-aosp.

2015-01-10 01:24:55 +00:00

res

am e24637e6: am 7f7ea82c: Profile owner hint in warning for extra CAs automerge: 34f3ade

2015-01-09 15:20:11 +00:00

tests

am 93241de7: Merge "Remove a bitrotted test." automerge: ba6982a

2014-12-18 02:42:27 +00:00