OSDN Git Service

Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct...
authorWink Saville <wink@google.com>
Tue, 13 Jan 2015 19:10:40 +0000 (19:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 Jan 2015 19:10:40 +0000 (19:10 +0000)

Trivial merge