OSDN Git Service

Merge "Merge commit '47eec246a9293616cb74d2c354be85201ec4e19e' into mergeit"
authorJeff Sharkey <jsharkey@google.com>
Wed, 31 May 2017 15:07:18 +0000 (15:07 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 31 May 2017 15:07:19 +0000 (15:07 +0000)

Trivial merge