tree 7e4161d4030b94fb864eb126f3488e7d0a8331b6
parent 9f6f0a7eb1d7f2c35f3547779364a1a8d6d4a24c
parent fc7992bd8220824f1404c0c54ac516d9e28b58c2
author Glenn Kasten <gkasten@google.com> 1346364300 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1346364301 -0700

Merge "Move libnbaio out of AudioFlinger" into jb-mr1-dev