am 69830d60: am 0183af75: Merge "omx: basecomponent: signal abendStateEvent if compon...
authorDima Zavin <dima@android.com>
Wed, 28 Nov 2012 01:33:35 +0000 (17:33 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 28 Nov 2012 01:33:35 +0000 (17:33 -0800)
* commit '69830d602d844af99dcbc9fa09629cc27e505e3c':
  omx: basecomponent: signal abendStateEvent if componentInit fails


Trivial merge