OSDN Git Service

Merge "Manual merge of changes from klp-dev"
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 30 Jan 2014 02:47:16 +0000 (02:47 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 30 Jan 2014 02:47:17 +0000 (02:47 +0000)

Trivial merge