OSDN Git Service

Merge branch 'klp-dev-plus-aosp' of sso://googleplex-android.git.corp.google.com...
authorQiwen Zhao <zhao@google.com>
Sat, 15 Feb 2014 00:23:01 +0000 (16:23 -0800)
committerQiwen Zhao <zhao@google.com>
Sat, 15 Feb 2014 00:23:01 +0000 (16:23 -0800)

Trivial merge