OSDN Git Service

am 9a9bedc8: (-s ours) am b169b49a: Merge "libgui: Add generation numbers to BufferQueue"
authorDan Stoza <stoza@google.com>
Tue, 9 Jun 2015 20:13:52 +0000 (20:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 9 Jun 2015 20:13:52 +0000 (20:13 +0000)
* commit '9a9bedc815c98a55e9fb25107be5b9d74410b8cf':
  libgui: Add generation numbers to BufferQueue


Trivial merge