tree dac2f5deae99a74c4c39077ba2073fc21f051067
parent ce9a76f40c35745908afb4c2304b639e7f41c09f
parent c1e3b0cda0709b70832542c58d5a0788b11a6188
author Android Build Merger (Role) <android-build-merger@google.com> 1502907582 +0000
committer Android Build Merger (Role) <android-build-merger@google.com> 1502907582 +0000

[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am: 9e41bec8d3  -s ours am: c1e3b0cda0

Change-Id: I203f15b2b318b43ef01ab2e741a2cec7a5a55e5c