OSDN Git Service

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

Change-Id: I8e00f66764aabdfd0ee4e531578a77dace3047e9


Trivial merge