OSDN Git Service

Merge changes I50493bca,I8b266ad0
authorMathieu Chartier <mathieuc@google.com>
Tue, 4 Oct 2016 01:09:28 +0000 (01:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Oct 2016 01:09:28 +0000 (01:09 +0000)
commitdeee36b949217ff4c8afe53218bb548e46cf7cc2
treeefc2dca0555e20a1bacb33728bf91d272fce133a
parentc6eb6f5f75011588c937b8da3c506a44e2e97b6f
parent5075b0e5e2cb942d3cb929a9fe7e1abe66beb562
Merge changes I50493bca,I8b266ad0
am: 5075b0e5e2

Change-Id: Id9374c534cf2dd03a4a71d38d83d3e670ca1ec7e