tree 1d0a66e7cfded41e0c2a0f86a06ea75e87696e38
parent 689d199ea352c4265d0d2c83bec23e6cb8c1b0bc
parent c1513f42eecca54c385a6e63abe6ddcfff5c911c
author Glenn Kasten <gkasten@google.com> 1328909681 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328909681 -0800

am c1513f42: Merge "Move declaration of stream_type_t up earlier"

* commit 'c1513f42eecca54c385a6e63abe6ddcfff5c911c':
  Move declaration of stream_type_t up earlier