From: The Android Automerger Date: Thu, 1 May 2014 12:50:32 +0000 (-0700) Subject: merge in master-release history after reset to cfaea7ea3ce54d82c7ecda09553c5e96add67b4b X-Git-Tag: android-x86-6.0-r1~60^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=139da8577df8f208057734ef6a9c593c340d3507;p=android-x86%2Fhardware-ril.git merge in master-release history after reset to cfaea7ea3ce54d82c7ecda09553c5e96add67b4b --- 139da8577df8f208057734ef6a9c593c340d3507