| commit | 9940639b95cd61c48dfdcb7370ef93c622ddbd73 | [log] [tgz] |
|---|---|---|
| author | Wonsik Kim <wonsik@google.com> | Wed Jul 13 04:37:54 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 13 04:37:54 2016 +0000 |
| tree | 7047cf1c8fc4aaf9c197340d80ad63608b826067 | |
| parent | 68523c45d33f9f591823b58f038a2e86d3e7241a [diff] | |
| parent | d7988a9727f2ff79d899facd032124cd990855ed [diff] |
Merge \\\\\\\\\\\\"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\\\\\\\\\\\\" into klp-dev am: b239e27433 am: cc3c549065 am: 19ca2d2486 -s ours am: ef64984fe6 -s ours am: fe184469d5 am: a0b2421e41 am: 5c7ed58364 -s ours am: bf592750d0 am: e8dd475879 am: 9f6b5dc900 am: 81e141f9d3 -s ours am: d7988a9727 Change-Id: I507b340ac2c89ff88ccc545c28011442dfb43fa2