tree fb6bc5275c7459eb3439e8cd4ddc0db25e2859cf
parent 8579011e2a7ad103363554b32d84534025b2bdc1
parent d97e14c1c20e3763f2e91e55da3255b55448cbfd
author Android Build Merger (Role) <android-build-merger@google.com> 1471296833 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1471296833 +0000

Merge "stagefright: handle NULL format after convertMetaDataToMessage am: 5bd99f9211 am: 775226f35d" into nyc-mr1-dev-plus-aosp