tree 966b73290b5bcf761dbaa73be1058961c5ef1e86
parent 489eb9bfaa7803d1efb022d92eebbdb53d0e0b5f
parent 8ec880eb854ae020819cea55187b2d9d607778f3
author Wonsik Kim <wonsik@google.com> 1468381539 +0000
committer android-build-merger <android-build-merger@google.com> 1468381539 +0000

Merge \"stagefright: fix possible stack overflow in AVCC reassemble\" into nyc-dev
am: 8ec880eb85

Change-Id: I6c5f20894a354a82421a72e6c3db6e11cb31b3eb