From: The Android Automerger <android-build@android.com>
Date: Tue, 15 Jan 2013 15:49:55 +0000 (-0800)
Subject: merge in master-release history after reset to master
X-Git-Tag: android-x86-6.0-r1~691^2~233^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2~1^2^2^2^2^2^2^2^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=841b07f49c6aaa425eae63b63dcef5e5cdcf76f9;p=android-x86%2Fframeworks-native.git

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

841b07f49c6aaa425eae63b63dcef5e5cdcf76f9