OSDN Git Service

Merge changes I281c748a,Ia5b68d59 into pi-dev
authorChavi Weingarten <chaviw@google.com>
Fri, 18 May 2018 22:04:27 +0000 (15:04 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 18 May 2018 22:04:27 +0000 (15:04 -0700)
am: 9335f1e363

Change-Id: Ie9562fa69fe9dc52f0464d208e1153420bb7c872


Trivial merge