tree 8df1b4bc0ab03bb9065bcca366b3ee4a4e6807d4
parent 6ce7e89899646689b4e72edc00801b5694821d52
parent 321c8cf5746774d7799c7ce7817e03d1603f0047
author Lajos Molnar <lajos@google.com> 1502756039 +0000
committer android-build-merger <android-build-merger@google.com> 1502756039 +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 am: 88fd67f2b3 am: fb1443d485
am: 321c8cf574

Change-Id: Ia020b6c661317a098bb7fdea910b09568bd7d267