OSDN Git Service

Merge changes I50493bca,I8b266ad0 am: 5075b0e5e2
authorMathieu Chartier <mathieuc@google.com>
Tue, 4 Oct 2016 01:11:36 +0000 (01:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Oct 2016 01:11:36 +0000 (01:11 +0000)
am: deee36b949

Change-Id: Ica63db11f1d6fdd1c1d7a6a2be5eec1df4e04ad8


Trivial merge