OSDN Git Service

am 81b7caf0: resolved conflicts for merge of 5214dae4 to klp-dev-plus-aosp
authorJeff Brown <jeffbrown@google.com>
Wed, 30 Oct 2013 01:32:29 +0000 (18:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Oct 2013 01:32:29 +0000 (18:32 -0700)
commitaa2f9f01fa820ba93eaff8916b74cbc4a2bf0254
tree4c4f4cf313ce2484d597dd52454f4a51acc20734
parent319b7b044c513f0e8c41cae4c2cee00cf415c5a7
parent81b7caf0d12fb56ab40592467d6b1cbcaef8f0b4
am 81b7caf0: resolved conflicts for merge of 5214dae4 to klp-dev-plus-aosp

* commit '81b7caf0d12fb56ab40592467d6b1cbcaef8f0b4':
  handle negative temperature