OSDN Git Service

Merge changes Ib5a3632c,I871f6b3c,I6ce0f71d am: 7cd7b964e2
authorAndreas Gampe <agampe@google.com>
Fri, 20 Jan 2017 02:06:33 +0000 (02:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 02:06:33 +0000 (02:06 +0000)
am: c077a2d541

Change-Id: I88c5e098c76762a7f813ef1f71118fc568f1a3fc


Trivial merge