OSDN Git Service

Manually merge commit '9733f2b8a3e520769ea3c15a177d5a227af62452' into pi-dev
authorJack He <siyuanh@google.com>
Mon, 4 Jun 2018 23:06:39 +0000 (16:06 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 4 Jun 2018 23:06:39 +0000 (16:06 -0700)
am: d1d46494f8

Change-Id: I946a15daeafd5b0dd593a2048f7aa35b2db498cc


Trivial merge