tree 0cce3d9d5ed8c64b1b83f0394fc71ba8cd623561
parent 844b01776d8f48d3928ced294bafbebeff622c4e
parent 8de71a2408f632407c25942a39c31f78c7f64ffd
author Dan Stoza <stoza@google.com> 1430328648 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430328648 +0000

am 8de71a24: Merge "BufferQueue: Add NATIVE_WINDOW_BUFFER_AGE query"

* commit '8de71a2408f632407c25942a39c31f78c7f64ffd':
  BufferQueue: Add NATIVE_WINDOW_BUFFER_AGE query