Colin Cross 6520711837 resolve merge conflicts of 77a7787 to master ...

Change-Id: I17f14a88b5b654a8860a09f610e797af15cedecc

2016-08-25 15:01:52 -07:00

..

java/android

resolve merge conflicts of 77a7787 to master

2016-08-25 15:01:52 -07:00

jni

ExifInterface: Remove JNI code

2016-08-10 11:49:20 +09:00

lib

Unbundle RemoteService on TV - part 3

2016-04-22 12:21:34 -07:00

mca

Merge \"Disable warning triggered in Clang r271374\"

2016-07-19 23:41:20 +00:00

packages/BluetoothMidiService

…

tests

Avoid JUnit4 collision in android-support-test, mockito-target

2016-08-25 19:37:46 +00:00