OSDN Git Service

Merge pi-dr1-dev to aosp-master
authorBill Yi <byi@google.com>
Fri, 19 Oct 2018 19:20:48 +0000 (12:20 -0700)
committerBill Yi <byi@google.com>
Fri, 19 Oct 2018 19:20:48 +0000 (12:20 -0700)
Change-Id: I0cf933755a46ad6071cb085120a4b1b1c5d1976c


Trivial merge