am 8167db47: am 80fe30bf: (-s ours) am 27ad6a99: Merge "Improve calibration and accou...
authorPyry Haulos <phaulos@google.com>
Thu, 27 Aug 2015 14:46:42 +0000 (14:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:46:42 +0000 (14:46 +0000)
* commit '8167db4730dab225a988d87a8f769dcee9f8c616':


Trivial merge