tree 0fdacb56082af39b5b42a99e3e143ff702ceea66
parent e976f79f328163a009f9884e6b07d08c3b973137
parent aa9ca29395eebfcfa64e070dc71009b99131769f
author James Dong <jdong@google.com> 1273082830 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273082830 -0700

am b8a8f850: am 8d30b2d2: Merge "Support AAC recording" into kraken