am 83af7012: (-s ours) am e0fc4b70: Merge "DO NOT MERGE Remove the...
am 83af7012: (-s ours) am e0fc4b70: Merge "DO NOT MERGE Remove the rs_quaternion functions until mr1" into honeycomb
* commit '83af7012':
DO NOT MERGE Remove the rs_quaternion functions until mr1