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
..