OSDN Git Service

Manually merge commit 'cc15f06acc3a1447318fefae00b3c10d9b7ae42a' to fix automerger...
authorStephen Li <stephenli@google.com>
Tue, 11 Oct 2016 17:48:10 +0000 (17:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Oct 2016 17:48:10 +0000 (17:48 +0000)
am: fb6d60efd7

Change-Id: I26739f40b456f7d01a588a81ff33b3bd76a30a47


Trivial merge