From: The Android Automerger <android-build@google.com>
Date: Tue, 20 May 2014 12:50:19 +0000 (-0700)
Subject: merge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996
X-Git-Tag: android-x86-6.0-r1~60^2^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=35b72433a75016d7a8e87940e916ca2ede9df5f2;p=android-x86%2Fhardware-ril.git

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

35b72433a75016d7a8e87940e916ca2ede9df5f2