Dmitriy Ivanov d7cc9e3163 am 5c04c4e7: am 6ced3b34: am 0d54e471: Merge "Remove code markers" ...

* commit '5c04c4e7b5f9dc76afe180c0b6a0901119834fcf':
  Remove code markers

2014-04-15 23:36:27 +00:00

..

java/android

Merge "Implement USB Audio across Nexus Devices Fix issues with connecting non-audio USB devices."

2014-04-11 21:18:51 +00:00

jni

am 5c04c4e7: am 6ced3b34: am 0d54e471: Merge "Remove code markers"

2014-04-15 23:36:27 +00:00

lib

resolved conflicts for merge of 4f342e87 to master

2014-04-03 11:51:37 -07:00

mca

Remove deprecated BufferQueue constructor

2014-03-12 17:02:07 -07:00

tests

MediaFrameworkTest: Fix Camera2 API unit test build breakage

2014-04-10 17:09:22 -07:00