From: The Android Automerger <android-build@google.com>
Date: Mon, 13 Apr 2015 13:45:21 +0000 (-0700)
Subject: merge in m-wireless-internal-release history after reset to 554b16da8c8f733b99cf8bfa9... 
X-Git-Tag: android-x86-6.0-r1~305^2^2~1^2~1^2~1^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e129d44411644bab179479551e4cd7134ebe7a9c;p=android-x86%2Fbuild.git

merge in m-wireless-internal-release history after reset to 554b16da8c8f733b99cf8bfa922182866d1486df
---

e129d44411644bab179479551e4cd7134ebe7a9c