tree b09e6f14a90ba7617ff3c6940e0a7d6166f80859
parent 8e867eb454efadca1f45a48d879ee57c883dbb91
parent 4a9375ef2a06fc36ec308835ef9e7e4eea2ba69f
author Andreas Huber <andih@google.com> 1265746231 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1265746231 -0800

Merge "A little less verbosity in stagefright and special treatment for the error state while shutting down."