tree e3dc1d1be5560e29835ffbf945b61bbcd9cdeb9a
parent eaf8cd4a1533afa654de1532b82af4fffac37c65
parent 64cd47c239497e54f3128f9ac2299c8cb305c8b4
author Wink Saville <wink@google.com> 1300135632 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300135632 -0700

am d9ca063d: (-s ours) am 64cd47c2: Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE

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