From: The Android Automerger <android-build@android.com>
Date: Wed, 24 Apr 2013 14:49:50 +0000 (-0700)
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
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a033281af536769e6ab9ebfacc321fef62443ae3;p=android-x86%2Fframeworks-native.git

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

a033281af536769e6ab9ebfacc321fef62443ae3