tree 7340b146dddbfc04df91e31e35aa68f179d705c1
parent 488d8d7a4735c7971bb0eb0a686cf02adab3b539
parent 93b2a3f4f8989931b3d967a9d7c0a42b3dab1aac
author Android Build Merger (Role) <android-build-merger@google.com> 1502754744 +0000
committer Android Build Merger (Role) <android-build-merger@google.com> 1502754744 +0000

[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev am: cddbfe5496 am: 3c2b8586ad am: 5dc58ac31b am: c42e782644 am: 5c9fc68825 am: bc0b041f30 am: 21c75b8f69 am: 93b2a3f4f8

Change-Id: Ie6d85e2fd0afeaa8d262493f9e18124297eb39f5