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)
commitfb370e54d615e0e195db296dd8d8ae6249f45038
treeed1891702025a0c407dfcd4bf3eaafa5d392de1a
parentb3f182000dd906556c77d75760c0ef28a0d9c064
parent4ed9f2295aed05c40f8f91cdb3695dbd7c641390
Merge changes Iac3db17f,I4221ef81 am: 0955e34843
am: 4ed9f2295a

Change-Id: I15e9af44cd60275afdd8491605a21555fdefc423