OSDN Git Service

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

Change-Id: I56e065ccaf56c063ad4662926dc3ca1cddda7097


Trivial merge