am c1e7b218: Merge "Improve input device calibration format." into gingerbread

Merge commit 'c1e7b2182594aa0463c4a738cc8e7eea6777ef50' into gingerbread-plus-aosp

* commit 'c1e7b2182594aa0463c4a738cc8e7eea6777ef50':
  Improve input device calibration format.