tree 3dd02cdb4322b54f605a0f515c9d193dac4f8e3f
parent f2135d166fc3b459df137df5b6642f015620e4d6
parent 128da7c8739935f38d04b9070650e3367bd98fc9
author Tej Singh <singhtejinder@google.com> 1522278127 +0000
committer android-build-merger <android-build-merger@google.com> 1522278127 +0000

Merge "Merge "Temperature atom: Use int instead of float." into pi-dev am: 31c807c987" into pi-dev-plus-aosp
am: 128da7c873

Change-Id: I3ad448137fce55ac5da0be114a78e63627ad05ff