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)
commit9731f5796c40dd366121b543d08217c5d3a63b36
tree2aa9e37766dff8e0900703c04346edc851c3bfee
parent268d7ad32995b3c4a9dfe4981878946db6d29ef4
parentbd28e2d9d3c2a7e80babd39471d5788843a48d4a
Merge "Manual merge of changes from klp-dev"