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)
commitdfad0653b23784084b32836d121167378a4f2ec5
tree8c48aa5b8ba1136ec95bd56c399fdd28cc2c31a7
parentf2d1a07abe0f3f5bbd13092efa1185f9da37a5c8
parent49fe27de4b36ca1ae8c9f19517e99ed0d3c43187
Merge "Fix build break" into pi-dev
am: 49fe27de4b

Change-Id: Ieb83099193d8b758492cf6cbdddad352a858120b