OSDN Git Service

Merge changes I8e51415a,I79a255c1
authorAndreas Gampe <agampe@google.com>
Mon, 21 Nov 2016 22:11:59 +0000 (22:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 Nov 2016 22:11:59 +0000 (22:11 +0000)
am: 668ba83a0a

Change-Id: Ibebfdde3f142515400a75a53f8d40ef99f64f50a


Trivial merge