OSDN Git Service

Merge "Fix build break" into pi-dev
authorLin Guo <linguo@google.com>
Mon, 7 May 2018 22:59:10 +0000 (15:59 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 7 May 2018 22:59:10 +0000 (15:59 -0700)
am: 49fe27de4b

Change-Id: Ieb83099193d8b758492cf6cbdddad352a858120b


Trivial merge