OSDN Git Service

Merge changes I236b1124,Iad16b06e into pi-dev
authorFan Zhang <zhfan@google.com>
Thu, 29 Mar 2018 03:04:11 +0000 (03:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Mar 2018 03:04:11 +0000 (03:04 +0000)
am: 6a89e511d1

Change-Id: I82ae2d375b99bd9c1ae58b2919ed87f02ed18adf


Trivial merge