tree 024dfdd400be07d667b03680613913ab279e5081
parent 32bddf1d84f7def396f9a0d6a13d39bb63adb4f2
author Jeff Tinker <jtinker@google.com> 1442256943 -0700
committer The Android Automerger <android-build@android.com> 1445453341 -0700

Fix for security vulnerability in media server DO NOT MERGE

bug: 23540426
Change-Id: I7ca419e4008967a0387649e5293ac9d4be71d3c4