OSDN Git Service

Merge changes I88886146,I1c076c7f into pi-dev
authorJakub Pawlowski <jpawlowski@google.com>
Wed, 30 May 2018 02:56:01 +0000 (19:56 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 30 May 2018 02:56:01 +0000 (19:56 -0700)
am: 02fa06d70d

Change-Id: I75cfe44bf91f17c478332d5c5c6dbaa25210d8d4


Trivial merge