OSDN Git Service

Merge changes I119cf83a,Icc5a1e38,If07a04d3
authorAndreas Gampe <agampe@google.com>
Wed, 25 Oct 2017 02:53:19 +0000 (02:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 25 Oct 2017 02:53:19 +0000 (02:53 +0000)
am: 61e3189ec7

Change-Id: I2ef7c49b23314a5cb94671bba0d3891b6b7c3920


Trivial merge