OSDN Git Service

Merge "thermalservice: Add ThermalService java interfaces" into oc-mr1-dev
authorTodd Poynor <toddpoynor@google.com>
Tue, 8 Aug 2017 01:23:35 +0000 (01:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 8 Aug 2017 01:23:35 +0000 (01:23 +0000)
am: 590f519f24

Change-Id: I1397add21609288770d46f21d8a23cf55e6e9a75

1  2 
Android.mk

diff --cc Android.mk
Simple merge