tree 9ef07dd0fc2d70fbadd2cbb147b8ae5c9cdadfe6
parent fde159f6fb0bfb4327cc62142dab4206c77811b9
parent 2389af0dc630dfb7bb8cf0002125668a44248e5e
author Andreas Huber <andih@google.com> 1321980064 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321980064 -0800

am cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1

* commit 'cb6fbc89c25298643ab342b4a228e772b0e56978':
  Report a runtime error instead of asserting on malformed avc configuration data.