| commit | 40b61174547cb932ba3da544e83f6ccf214be3ed | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Thu Dec 05 22:51:53 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 22:51:53 2013 +0000 |
| tree | 46b6a182d174deace26c5bc5f66ffb4a8b46fd44 | |
| parent | c91b3f7c2848dec7b4db8a6583a7a44af6d4d0e9 [diff] | |
| parent | 899180eab65d54181f6d99c239cae63be1b1d908 [diff] |
am 899180ea: (-s ours) am 8ec8a534: am 1e0b0808: Merge "Restore stagefright command line tool." into klp-dev * commit '899180eab65d54181f6d99c239cae63be1b1d908':