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)
commit1a392aa114a7aeacc0464b56d4392449b8782542
tree453a7e5534ae18a85ca94f923952d410fa1e2658
parent9042b116b62a287bb86a18af6b428c7a2b7720aa
parentc263ca0ad8b6bdf5b0693996bc5f2f5916e0cd49
Merge "Squashed commit of the following:" into lmp-preview-dev