am 1afeea0f: (-s ours) Merge "work around a problem where fp registers get...
am 1afeea0f: (-s ours) Merge "work around a problem where fp registers get corrupted (DO NOT MERGE)" into ics-factoryrom
* commit '1afeea0f':
work around a problem where fp registers get corrupted (DO NOT MERGE)