| commit | e53044d9686be6b704ebb88c77e95f91956e67f9 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Wed May 29 19:11:53 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed May 29 19:11:53 2013 +0000 |
| tree | b996b95afcc7876c8420c47c29ae16e74d3dbc2d | |
| parent | 5c06681ea4783e7284e9adec7d7c8f338ef263d8 [diff] | |
| parent | 3b786a962c4af01911c7dac01d2230c636257c37 [diff] |
Merge "media.MediaMuxer: remove unused SAMPLE_FLAG_SYNC flag." into jb-mr2-dev
diff --git a/api/18.txt b/api/18.txt index e5fd378..9eef734 100644 --- a/api/18.txt +++ b/api/18.txt
@@ -11989,7 +11989,6 @@ method public void start(); method public void stop(); method public void writeSampleData(int, java.nio.ByteBuffer, android.media.MediaCodec.BufferInfo); - field public static final int SAMPLE_FLAG_SYNC = 1; // 0x1 } public static final class MediaMuxer.OutputFormat {