OSDN Git Service

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

Change-Id: I15e9af44cd60275afdd8491605a21555fdefc423


Trivial merge