OSDN Git Service

Merge changes I303d1102,I72c9aa43,If13a5284
authorHugo Benichi <hugobenichi@google.com>
Tue, 30 Jan 2018 01:41:23 +0000 (01:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 30 Jan 2018 01:41:23 +0000 (01:41 +0000)
am: cf5841db8d

Change-Id: I402de7fe5fc0e9bf56dc42f4c956c511baee78ab


Trivial merge