| commit | 2447efab76c21673f626982399ac9c64e380e130 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Sat Feb 13 01:19:59 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Feb 13 01:19:59 2016 +0000 |
| tree | 6c1cbf93fa340f1e9400a21d68bbb2fc31487a87 | |
| parent | d5f51b231cbaeec8c880e202a937acb1bffad740 [diff] | |
| parent | f24971237e8647028c4498f76bffc7b90afabe74 [diff] |
Merge changes I3aa5872e,I914bcc88,Icc6d023f,Ic262482a am: f24971237e -s ours * commit 'f24971237e8647028c4498f76bffc7b90afabe74': stagefright: use small timeout for input buffer in SimpleDecodingSource stagefright: CodecCapabilities: fix missing capabilities stagefright: ACodec: remove infinite loops stagefright: ACodec: query color format support on specific port