From: Dan Stoza <stoza@google.com>
Date: Tue, 9 Jun 2015 20:13:52 +0000 (+0000)
Subject: am 9a9bedc8: (-s ours) am b169b49a: Merge "libgui: Add generation numbers to BufferQueue"
X-Git-Tag: android-x86-7.1-r1~544^2~265
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8efa01d9da98b036628a73353bd0ac8a6e360c7d;p=android-x86%2Fframeworks-native.git

am 9a9bedc8: (-s ours) am b169b49a: Merge "libgui: Add generation numbers to BufferQueue"

* commit '9a9bedc815c98a55e9fb25107be5b9d74410b8cf':
  libgui: Add generation numbers to BufferQueue
---

8efa01d9da98b036628a73353bd0ac8a6e360c7d