From: Dan Stoza <stoza@google.com>
Date: Mon, 1 Jun 2015 18:43:56 +0000 (+0000)
Subject: am 2daeb124: am edcfe7c5: Merge "libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc"
X-Git-Tag: android-x86-7.1-r1~1017
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0e11b2b39ee12965fd226bdb6e677283ef099965;p=android-x86%2Fframeworks-native.git

am 2daeb124: am edcfe7c5: Merge "libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc"

* commit '2daeb124818ade7b83deaa9decd1592473ec19f3':
  libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc
---

0e11b2b39ee12965fd226bdb6e677283ef099965