OSDN Git Service

Merge changes Ic0515cec,If547bd96 into pi-dev
authorOscar Shu <xshu@google.com>
Fri, 6 Apr 2018 20:33:42 +0000 (13:33 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Apr 2018 20:33:42 +0000 (13:33 -0700)
am: bc73b3b6e9

Change-Id: Id1c3c397b4199eaf7e64e9e6857320d66efa878b


Trivial merge