tree f18d2852af294f2b404bc354c3c7efc3f96ccdc9
parent b8fca94e81698229970124d7feba4242b4b504f3
parent 4e3dc2df5fc3ee144cf6bb251b5f592b0d859315
author Dan Stoza <stoza@google.com> 1430329360 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430329360 +0000

am 4e3dc2df: am 5d67a2c9: Merge "ANativeWindow: Add NATIVE_WINDOW_BUFFER_AGE query"

* commit '4e3dc2df5fc3ee144cf6bb251b5f592b0d859315':
  ANativeWindow: Add NATIVE_WINDOW_BUFFER_AGE query