OSDN Git Service

Merge changes Ie8b78c7c,If02081d2 am: fe177b78d7
authorCalin Juravle <calin@google.com>
Wed, 1 Nov 2017 22:38:31 +0000 (22:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 1 Nov 2017 22:38:31 +0000 (22:38 +0000)
commit23bf5b67e6ceb7be075f415055123d98432994ff
tree8be6895eb7abf12d3f2bac816d05a01fff0fd4a0
parentad0cc34ddd3d11c88126010b1e05e31387e657ec
parenta47c4440fd4daa1c67c19191e89c9c6762e00ccc
Merge changes Ie8b78c7c,If02081d2 am: fe177b78d7
am: a47c4440fd  -s ours

Change-Id: If37dbec17b0aa7e2443f9547eff63a6740d6fb75