tree 92c4ccdbbeea015ba81f6da67465a3f3e8598bcd
parent 9243ed4d2e570fbeb08b23c0856d4064fa30be27
parent 0f71d1fd50108f1589b437ecfae933a1701de291
author panshuangquan <panshuangquan@xiaomi.com> 1497387430 +0000
committer android-build-merger <android-build-merger@google.com> 1497387430 +0000

Merge "fix potential mediaserver crash in ACodec::getPortFormat" am: c3f020b2b9
am: 0f71d1fd50

Change-Id: Ice46324de7c8cfd539f5ebea58b6f1c63cea8383