tree b68d6fd3e05fc90c2075d71fb894c6489f8c26e4
parent f667351d11451ad58635fd9b1d93831ae7c990d7
parent e9e6bd023704dfab7aca5dc6513ac84a237052f1
author Wonsik Kim <wonsik@google.com> 1468384018 +0000
committer android-build-merger <android-build-merger@google.com> 1468384018 +0000

Merge \\\\\\\"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\\\\\\\" into lmp-dev am: 250935d18a  -s ours am: 0db8fd31e1 am: ca08fe34fe am: 622d070c22  -s ours am: 27ebbf8625 am: a8dc78e5db
am: e9e6bd0237

Change-Id: Ifaf697534f84f188649d1b90f860c6ce85c9e4bd