OSDN Git Service

Merge changes I6ff2d6f8,I8f60f116 am: 6b8b075211 am: 37c1413ab2 am: f7fc407e3e
authorAndreas Gampe <agampe@google.com>
Fri, 21 Apr 2017 19:15:39 +0000 (19:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 21 Apr 2017 19:15:39 +0000 (19:15 +0000)
am: 3aed257fb5

Change-Id: I1719981cfd3f852277894ba20d70e2406f2568a6


Trivial merge