OSDN Git Service

Merge changes I3dd31855,Id5a75217 into pi-dev
authorIvan Chiang <chiangi@google.com>
Fri, 27 Apr 2018 02:06:38 +0000 (19:06 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 Apr 2018 02:06:38 +0000 (19:06 -0700)
commite598b1ae03378f314bf5f240692e70190998de87
tree5ed2cfe48e2e96c2bcb34f533cc9f6d0fac0e422
parentd7d1f98fa73cd439c2480368d9ddb74de1e4bc37
parent720a224e0059c0c9e0aeab26c42fac8b46d0117b
Merge changes I3dd31855,Id5a75217 into pi-dev
am: 720a224e00

Change-Id: Ibf611643afabea5ed181b0336da5e949d416e064