OSDN Git Service

Merge "Fix the build failure for iot targets in master-iot-dev" am: 6e7c4df7cc
authorNan Zhang <nanzhang@google.com>
Thu, 22 Feb 2018 22:09:42 +0000 (22:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Feb 2018 22:09:42 +0000 (22:09 +0000)
am: 7887ff0b10

Change-Id: I3cf9e3ff4dfec75e6aeaa63785c519ccddf2a284


Trivial merge