tree 8e0e9525b0de99f4993e4d7a3ca40a9cfd368f9a
parent e0801bd0d1aaf3902c7b1a86aa9399aefbb46935
parent aa40b834985023642b30fa2e0563c414a994bd3a
author James Dong <jdong@google.com> 1283286579 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283286579 -0700

am aa40b834: am 6aacad66: Merge "Add some encoding parameters for the "record" utility" into gingerbread

Merge commit 'aa40b834985023642b30fa2e0563c414a994bd3a'

* commit 'aa40b834985023642b30fa2e0563c414a994bd3a':
  Add some encoding parameters for the "record" utility