From: The Android Automerger <android-build@google.com>
Date: Sun, 6 Apr 2014 12:49:10 +0000 (-0700)
Subject: merge in master-release history after reset to master
X-Git-Tag: android-x86-6.0-r1~1145^2~24^2~1^2~2^2~3^2~3^2~1^2~1^2~6^2~3^2~2^2~2^2~1^2~1^2~7^2~2^2~1^2~3^2~2^2~1^2~1^2~5^2~4^2~2^2~3^2~1^2~1^2~3^2~3^2~3^2~2^2~1^2~1^2~3^2~3^2~1^2~1^2~1^2~1^2~2^2~3^2~2^2~2^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=04e3b41b27ced3353421e2a33d1b50aafc701204;p=android-x86%2Fbuild.git

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

04e3b41b27ced3353421e2a33d1b50aafc701204