OSDN Git Service

Merge changes Ie8b78c7c,If02081d2 am: fe177b78d7 am: a47c4440fd -s ours
authorCalin Juravle <calin@google.com>
Wed, 1 Nov 2017 22:52:05 +0000 (22:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 1 Nov 2017 22:52:05 +0000 (22:52 +0000)
am: 23bf5b67e6  -s ours

Change-Id: I74ca3369845db058684a5ecef8cca03073831c20


Trivial merge