am 93f5b333: am 050ff19e: Merge "libstagefright: defer kWhatSetParameters in...
am 93f5b333: am 050ff19e: Merge "libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedState"
* commit '93f5b333':
libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedState