From: The Android Automerger <android-build@google.com>
Date: Thu, 22 May 2014 12:50:26 +0000 (-0700)
Subject: merge in master-release history after reset to fca1b54031a1ba2a3c82bbbbe71716cd7e6a61d7
X-Git-Tag: android-x86-6.0-r1~715^2~7^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=30fc16db37c654944df23d13ee36cd4656fef482;p=android-x86%2Fframeworks-native.git

merge in master-release history after reset to fca1b54031a1ba2a3c82bbbbe71716cd7e6a61d7
---

30fc16db37c654944df23d13ee36cd4656fef482