| commit | 4c286a3b95291b34c87af0cbff946d5c139be685 | [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 | a3487a896595852219292e067fa6a3d9f25abed6 | |
| parent | d3d77fa261f995ab8fcc2fe1f6b9ad60b179e7f9 [diff] | |
| parent | b8397d485db215075aab95472ae079c70ede7006 [diff] |
am eb483de5: am bf5c5e5b: am c1da1e1b: am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering" * commit 'eb483de58e4b41cb549149459e492e9ad1d65bd0': stagefright amrwbenc: Change keyword ordering