OSDN Git Service

Merge changes I2ef3737f,If080281f
authorMathieu Chartier <mathieuc@google.com>
Tue, 31 Oct 2017 22:31:32 +0000 (22:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 31 Oct 2017 22:31:32 +0000 (22:31 +0000)
commit18a93665a09944939045db1e85c456cf8c501ff4
tree44b14451d6ae3bc0d19113c672840e42e3d8c5e6
parent83fabf2fd6f8d12f96b38d21149168728f1c5c8e
parentbb3de35e5f7fc17d7f7eee68730c04b0c263172d
Merge changes I2ef3737f,If080281f
am: bb3de35e5f

Change-Id: Ibe1af669d200057f1d91142299055694b55b5660