OSDN Git Service

Merge "Squashed commit of the following:" into lmp-preview-dev
authorGlenn Kasten <gkasten@google.com>
Thu, 5 Jun 2014 14:44:32 +0000 (14:44 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 5 Jun 2014 14:44:32 +0000 (14:44 +0000)

Trivial merge