tree 7a7d0e925e1ea5f3bbf8a5467b935d9f5646570f
parent 4f74be57e72cb2fbee05184f5bc00e716d0b95b3
parent f7f1280e0c71d64098efb42b58a922d056164b5e
author Jean-Baptiste Queru <jbq@google.com> 1330376853 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330376853 -0800

am f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7

* commit 'f7f1280e0c71d64098efb42b58a922d056164b5e':
  stagefright amrnb: Remove extern from table definitions
  stagefright amrnb: Add includes for prototype declarations of tables
  stagefright amrnb: Add missing const qualifier to table declarations in headers