OSDN Git Service

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

Change-Id: Id9374c534cf2dd03a4a71d38d83d3e670ca1ec7e


Trivial merge