tree 2f90d27d6fd26cb6ff382cfdc99597f32eb85014
parent 6adf95f76b457c8606119380c7a0eb311269f87a
parent 88fd67f2b3ff630c41485d6a258075d0e7a9298c
author Android Build Merger (Role) <android-build-merger@google.com> 1502754749 +0000
committer Android Build Merger (Role) <android-build-merger@google.com> 1502754749 +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

Change-Id: I2511f9f153451bacd186bd25998323c3977156d6