OSDN Git Service

Merge changes Ia0623d38,Iaabd5d8b,I579bb12f,Ia9930edd
authorCalin Juravle <calin@google.com>
Wed, 1 Nov 2017 02:43:04 +0000 (02:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 1 Nov 2017 02:43:04 +0000 (02:43 +0000)
am: 2b1357fe90

Change-Id: Iee60be352c2e742fdd1d3f7ce15e58e455ac1ead


Trivial merge