am d9ca063d: (-s ours) am c3853f36: Merge "Do not merge: Add some input...
am d9ca063d: (-s ours) am c3853f36: Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE
* commit 'd9ca063d':
Do not merge: Add some input checking to prevent problems