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)
commit2ded154b49393862f1ac0bbc9b7cb543cae0dcac
treee10db725d80d69d7a38064d0715ab8f27b17ef20
parentd87a3647627a86b247ecde7531a6cbba0da76a4c
parent668ba83a0a1c0d952e1f310f6332131d9dccc8be
Merge changes I8e51415a,I79a255c1
am: 668ba83a0a

Change-Id: Ibebfdde3f142515400a75a53f8d40ef99f64f50a