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

merge in master-release history after reset to 574b641173debed3c0714628dba963e4d276374d
---

c4780e612f0b7abf3e32304e798e13ea582175af