OSDN Git Service

Merge branch 'lmp-dev' of sso://googleplex-android.git.corp.google.com/platform/frame...
authorGeoff Mendal <mendal@google.com>
Mon, 11 Aug 2014 20:31:17 +0000 (13:31 -0700)
committerGeoff Mendal <mendal@google.com>
Mon, 11 Aug 2014 20:31:17 +0000 (13:31 -0700)

Trivial merge