tree 14ee2560f7e578d1004ec3481931336a672104af
parent 35b0da6727a6c709542511ef5bcc3ecba1942e6b
parent 8ec8a5346831efa699d31274363da9cf516981db
author Andreas Huber <andih@google.com> 1376413799 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376413799 -0700

am 8ec8a534: am 1e0b0808: Merge "Restore stagefright command line tool." into klp-dev

* commit '8ec8a5346831efa699d31274363da9cf516981db':
  Restore stagefright command line tool.