tree 9d11e5f9ee406798070a5cb335390147ae1dffa5
parent 972ddedb6a64b618980944f7df2f1ad1cf0b7c25
parent 97e8ff0b4bcfa9cc9205b2881a110a1c498c5deb
author Mathias Agopian <mathias@google.com> 1274751125 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274751125 -0700

am 2e948ca1: Merge "added the notion of fixed-size buffers" into kraken