OSDN Git Service

Merge changes Iac3db17f,I4221ef81
authorAndreas Gampe <agampe@google.com>
Tue, 13 Dec 2016 20:16:10 +0000 (20:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Dec 2016 20:16:10 +0000 (20:16 +0000)
am: 0955e34843

Change-Id: Ic30935bfd9aff2ac04fd42ac58932170d94266f5


Trivial merge