Jean-Michel Trivi 50bafe9e6b Merge "MediaFormat: fix javadoc for AAC-related keys" into pi-dev am: 1b3ef3cb7d ...

am: 6a59e737fc

Change-Id: If6819e397dbb927974ee8ef380865d10b11114a1

2018-05-18 13:59:22 -07:00

..

java

Merge "MediaFormat: fix javadoc for AAC-related keys" into pi-dev am: 1b3ef3cb7d

2018-05-18 13:59:22 -07:00

jni

Merge "Don't treat failed scans as valid media files" into pi-dev am: e4dc997cf6

2018-04-27 14:53:45 -07:00

lib

Merge "Fix link-type check warning on com.android.mediadrm.signer"

2018-03-01 02:47:23 +00:00

mca

Merge "Convert to Soong" am: acbd94d76f

2018-05-15 15:06:19 -07:00

native

Moving native MIDI JNI init to AndroidRuntime.cpp.

2018-05-11 09:10:38 -07:00

packages/BluetoothMidiService

frameworks/base: Set LOCAL_SDK_VERSION where possible.

2018-02-28 17:15:21 +00:00

tests

Merge "Convert to Soong" am: acbd94d76f am: b1005a8a2a

2018-05-15 15:52:51 -07:00

OWNERS

update OWNERS

2018-03-15 21:46:13 +00:00