tree 77fb642a50c459761327a263b17ec2edcff4f1cb
parent 4ee00072f60200aa8cbe21d59861c17d6640ce00
parent 6fc85a670470f59d6a8e5a2d58687fa3bb7bd063
author Android Build Merger (Role) <android-build-merger@google.com> 1502907610 +0000
committer Android Build Merger (Role) <android-build-merger@google.com> 1502907610 +0000

[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am: 9e41bec8d3  -s ours am: c1e3b0cda0 am: f6ae88fdec am: 398d2167a0 am: 94b2e04aae am: 35a1e90c82 am: dc3b1f6afb am: 6fc85a6704

Change-Id: Id8f2a4db1283fdd1fac8376c4e52566347ab6fa9