From: Xia Wang <xiaw@google.com>
Date: Fri, 30 Jul 2010 20:46:14 +0000 (-0700)
Subject: am 060f053e: DO NOT MERGE
X-Git-Tag: android-x86-4.4-r1~69^2~11
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2e977068a167ea597b6514501d2221c5a4e22574;p=android-x86%2Fhardware-ril.git

am 060f053e: DO NOT MERGE

Merge commit '060f053e816137fb4f5e03c15b5122c92219ed52' into gingerbread-plus-aosp

* commit '060f053e816137fb4f5e03c15b5122c92219ed52':
  DO NOT MERGE
---

2e977068a167ea597b6514501d2221c5a4e22574