OSDN Git Service

Merge changes I65bc7769,Ib24c7060 am: d74bd3a9a4
authorAndreas Gampe <agampe@google.com>
Tue, 4 Oct 2016 19:14:13 +0000 (19:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Oct 2016 19:14:13 +0000 (19:14 +0000)
am: c3e2247adb

Change-Id: I33ef87ee020e0dc215aba9eef3434e55c9b474b5


Trivial merge