From: Dan Stoza <stoza@google.com>
Date: Thu, 28 May 2015 21:08:17 +0000 (+0000)
Subject: am 0a70ed99: Merge "Fix surfaceflinger tests."
X-Git-Tag: android-x86-7.1-r1~1005^2~13
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8191944fd2828ea3b848fcf378a39f146af7f38c;p=android-x86%2Fframeworks-native.git

am 0a70ed99: Merge "Fix surfaceflinger tests."

* commit '0a70ed998cad67bf1c82e82d4229291c9dcc22ac':
  Fix surfaceflinger tests.
---

8191944fd2828ea3b848fcf378a39f146af7f38c