OSDN Git Service

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

Change-Id: I9151ac06eeccdb477d9975a44e27a4e8eb16974c


Trivial merge