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)
am: 8ac85b2361

Change-Id: I169323587b9a57c3ce8dbad4e2b328244d3d43e4


Trivial merge