OSDN Git Service

Merge changes I17c68573,Ic9096cf6
authorAndreas Gampe <agampe@google.com>
Wed, 6 Dec 2017 03:34:51 +0000 (03:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Dec 2017 03:34:51 +0000 (03:34 +0000)
am: ce42c93b66

Change-Id: Ic87c6d8e9b50ab6349e62525fd2db0ac9c438dcf


Trivial merge