OSDN Git Service

Manually merge commit 'cc15f06acc3a1447318fefae00b3c10d9b7ae42a' to fix automerger...
authorStephen Li <stephenli@google.com>
Tue, 11 Oct 2016 17:42:30 +0000 (17:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Oct 2016 17:42:30 +0000 (17:42 +0000)
commitfb6d60efd745961ecddf396cd2eecf5eb58763e0
treea71ed486384a176dafcad85932c15219730f8955
parent0439d33163e9f62cd58404e11cc9067b2c703187
parent8ac85b2361d2ff1af1fc21c8ecc3092da30af0cc
Manually merge commit 'cc15f06acc3a1447318fefae00b3c10d9b7ae42a' to fix automerger am: 9ad78d6513
am: 8ac85b2361

Change-Id: I169323587b9a57c3ce8dbad4e2b328244d3d43e4