Andy Hung c6e0d5f125 resolve merge conflicts of ffe502b to cw-f-dev ...

am: 3dd656c624

Change-Id: I8217da44238234d4ba4c34ea76f5bd78fd7b87d2

2016-10-18 20:11:21 +00:00

..

java/android

resolve merge conflicts of ffe502b to cw-f-dev

2016-10-18 20:11:21 +00:00

jni

Merge "Fix struct vs. class mismatch in forward definitions" am: 8f1011d584 am: 6d0b466935

2016-10-03 20:32:01 +00:00

lib

…

mca

Fix google-explicit-constructor warnings in media/mca.

2016-08-29 14:47:52 -07:00

packages/BluetoothMidiService

…

tests

ExifInterfaceTest: Catch IOException am: c9ed3b8a5b am: a4ec9714b3 am: b6f40a84fa

2016-10-18 17:55:20 +00:00