From: The Android Automerger <android-build@android.com>
Date: Wed, 3 Apr 2013 14:49:15 +0000 (-0700)
Subject: merge in master-release history after reset to master
X-Git-Tag: android-x86-6.0-r1~1204^2~658^2~2^2~3^2~2^2~5^2~2^2~2^2~2^2~4^2~3^2~6^2~2^2~2^2~3^2~3^2~2^2~2^2~2^2~4^2~3^2~2^2~2^2~3^2~2^2~5^2~1^2~1^2~4^2~5^2~1^2~2^2~1^2~2^2~2^2~5^2~1^2~1^2~3^2~1^2~1^2~1^2~1^2~1^2~3^2~2^2~1^2~1^2~1^2~1^2~2^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~2^2~1^2~1^2~1^2~1^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e33198651e3d59a614c879fd5968c4d03d8c2711;p=android-x86%2Fbuild.git

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

e33198651e3d59a614c879fd5968c4d03d8c2711