am 23316a1e: (-s ours) am 00139b22: Merge "Fix for bug 6716343. Use correct...
am 23316a1e: (-s ours) am 00139b22: Merge "Fix for bug 6716343. Use correct offset for mPos reset. DO NOT MERGE" into jb-dev
* commit '23316a1e':
Fix for bug 6716343. Use correct offset for mPos reset. DO NOT MERGE