OSDN Git Service

Merge "Squashed commit of the following:"
authorGlenn Kasten <gkasten@android.com>
Wed, 17 Aug 2016 18:02:53 +0000 (18:02 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 17 Aug 2016 18:02:53 +0000 (18:02 +0000)

Trivial merge