From: The Android Automerger <android-build@android.com>
Date: Mon, 22 Apr 2013 14:49:09 +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
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ac81a630ffec052343f6106568b50d9f1e5bd85c;p=android-x86%2Fbuild.git

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

ac81a630ffec052343f6106568b50d9f1e5bd85c