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)
commitb6764c7a76f0ad413b58ad82c4f01035b5de28a2
treec5072d2feefb2be81af58fe59195b78229292709
parent531cdf55e0666c8186aa1c6892e63ff8a1a5e662
parent29c844550e5daee6b7ca6ebd27c260303d3a0145
Merge changes I50493bca,I8b266ad0 am: 5075b0e5e2 am: deee36b949
am: 29c844550e

Change-Id: I9151ac06eeccdb477d9975a44e27a4e8eb16974c