commit | f2f4a649d71aea5066d609c10cd9449df9abd453 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Mon Feb 27 13:14:48 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 27 13:14:48 2012 -0800 |
tree | 700724e0704d1a0edb1a42805154a6c00e68a8fd | |
parent | c0502b930651092683a5f47c55159b559fae7727 [diff] | |
parent | 59e82a04949ffca325508f5ebf43fdb8657e350c [diff] |
am eb483de5: am bf5c5e5b: am c1da1e1b: am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering" * commit 'eb483de58e4b41cb549149459e492e9ad1d65bd0': stagefright amrwbenc: Change keyword ordering