Marco Nelissen 8dc50416a2 resolved conflicts for merge of 375e21f8 to mnc-dev-plus-aosp ...

Change-Id: I5681890381beed09e8719b066d0c37accae1658d

2015-04-28 09:42:54 -07:00

..

java/android

resolved conflicts for merge of 375e21f8 to mnc-dev-plus-aosp

2015-04-28 09:42:54 -07:00

jni

ImageWriter: Change detach to sp<GraphicBuffer>

2015-04-27 11:31:12 -07:00

lib

…

mca

Add missing <string.h> includes.

2015-01-25 08:33:36 -08:00

packages/BluetoothMidiService

BluetoothMidiService: Use MidiBtleTimeTracker to interpret incoming Bluetooth MIDI timestamps

2015-04-21 13:28:08 -07:00

tests

camera2: validate reprocess request's session

2015-04-23 15:21:07 -07:00