OSDN Git Service

[automerger skipped] Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into...
authorJeff Sharkey <jsharkey@android.com>
Fri, 1 Jun 2018 22:57:36 +0000 (15:57 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jun 2018 22:57:36 +0000 (15:57 -0700)
am: 2b9a343319  -s ours

Change-Id: Ibdcc6722750cfe7cb394a52d21de8e73ecdfd650


Trivial merge