OSDN Git Service

Merge changes I0ff0c4f4,I6bdfa2f5 am: a63eab4f6c
authorAndreas Gampe <agampe@google.com>
Fri, 3 Nov 2017 22:20:44 +0000 (22:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Nov 2017 22:20:44 +0000 (22:20 +0000)
am: ac2645b1c3

Change-Id: Ieb73606fd2f92f491d83e08f84a277d8c25af857


Trivial merge