OSDN Git Service

Merge changes I914dfac9,I33b1934a
authorAndreas Gampe <agampe@google.com>
Fri, 20 Jan 2017 17:09:14 +0000 (17:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 17:09:14 +0000 (17:09 +0000)
am: 7709f7bec8

Change-Id: I85cd1c69a758bda81420849144d0b0fe2d7d2411


Trivial merge