OSDN Git Service

Merge changes I478047cc,Ibe16ffd7 into pi-dev
authorAdrian Roos <roosa@google.com>
Mon, 16 Apr 2018 16:16:56 +0000 (09:16 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 16 Apr 2018 16:16:56 +0000 (09:16 -0700)
commit21c2c55336873f96331922faf9ff4c31b417da98
tree9ae9b692d6c4741604b00d4b5d2aa9953dc24619
parent8868d5882ba5b2ca9444c6fc5bb52b63777707da
parent892ee93977dfc260c3b7b590ea86bcc9093bc4d0
Merge changes I478047cc,Ibe16ffd7 into pi-dev
am: 892ee93977

Change-Id: Id60ec23a210c907bf61a4f0c95441e5f48b773cc