am c3853f36: Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE
am c3853f36: Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE

* commit 'c3853f36645f2f4f4801d6465e82095cf38ea043':
  Do not merge: Add some input checking to prevent problems

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base