OSDN Git Service

Merge changes from topic "b_78809704" into pi-dev
authorTodd Kennedy <toddke@google.com>
Fri, 11 May 2018 18:15:10 +0000 (11:15 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 May 2018 18:15:10 +0000 (11:15 -0700)
am: 92b64bb1bb

Change-Id: I08a9b59d00c9e7aa075c21c44b582d571fe79fd7


Trivial merge