am d185494d: (-s ours) am e1c8e388: Merge "Port mock ril controller and tests...
am d185494d: (-s ours) am e1c8e388: Merge "Port mock ril controller and tests to GB. DO NOT MERGE" into gingerbread
Merge commit 'd185494d'
* commit 'd185494d':
Port mock ril controller and tests to GB. DO NOT MERGE