OSDN Git Service

Merge "Fix MediaCodec FLAC Javadoc" into oc-mr1-dev am: 546c644f27
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Thu, 2 Jan 2020 20:47:01 +0000 (20:47 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Thu, 2 Jan 2020 20:47:01 +0000 (20:47 +0000)
commitaf521c4cedf038b57b6fee6ba1726a992c9a9c65
tree7e4ea4908ff6c3e1a45bfd108b839dbbc7281ed4
parent929b23ac43dff1a4be24818504ea9806293e892c
parent546c644f2792af57ed8a280d2fa14db447c073ee
Merge "Fix MediaCodec FLAC Javadoc" into oc-mr1-dev am: 546c644f27

Change-Id: I511da6d59c3b525cb678d6bb08a6cfa8e4e5a94f
media/java/android/media/MediaCodec.java