tree d85a6bd2fa5026d8a76a052fd053da174c2b33fc
parent bb7272f137ad3558bba5ee3a31dcfe4f41cc797f
parent 1585c4d9fbbba3ba70ae625923b85cd02cb8a0fd
author Andy McFadden <fadden@android.com> 1373553645 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1373553645 +0000

Merge "Pay attention to buffer timestamps"