OSDN Git Service

Merge "Merge commit '953baf092376b91f1e6531f5718dfce89f4bc8c6' into manual_merge_953b...
authorDavid Sehr <sehr@google.com>
Wed, 31 Aug 2016 21:41:37 +0000 (21:41 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 31 Aug 2016 21:41:37 +0000 (21:41 +0000)

Trivial merge