Lajos Molnar a4b5454f73 Merge \"media: update getAchievableFrameRatesFor javadoc\" into nyc-dev ...

am: 8fe82686ef

Change-Id: I7eac5a104c11d6176d0b8c5469e9a35b36e5cdc4

2016-06-23 21:33:51 +00:00

..

java/android

Merge \"media: update getAchievableFrameRatesFor javadoc\" into nyc-dev

2016-06-23 21:33:51 +00:00

jni

Merge \"Report error correctly for the implementation of StreamInterface::GetData()\" into nyc-dev

2016-06-16 20:05:17 +00:00

lib

…

mca

resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp

2016-04-28 12:08:15 -07:00

packages/BluetoothMidiService

…

tests

Merge "Code Patch for camera preview switch tests" into nyc-dev

2016-05-27 22:40:26 +00:00