tree 320eefe7f771bc4e67ad0aa9f4df204c87f5f615
parent c1da1e1b2f18896c65df85de93a07680175c5277
parent fe5f5d7728b7f8be24716fda6eb1480eb9dfb72f
author Jean-Baptiste Queru <jbq@google.com> 1330376840 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330376840 -0800

am fe5f5d77: Merge "stagefright amrwb: Make a global const array static"

* commit 'fe5f5d7728b7f8be24716fda6eb1480eb9dfb72f':
  stagefright amrwb: Make a global const array static