OSDN Git Service

am 9731f579: Merge "Manual merge of changes from klp-dev"
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 30 Jan 2014 02:49:24 +0000 (18:49 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Jan 2014 02:49:24 +0000 (18:49 -0800)
commitdec61c24db2f7af30c0ddfd52e53ab451f1cf6b2
treecbc46f7670e1f935fe9798216dce0adbf41e2790
parent76b1d5d8bbe53da44f406bef2fb29e99a0a9a617
parent9731f5796c40dd366121b543d08217c5d3a63b36
am 9731f579: Merge "Manual merge of changes from klp-dev"

* commit '9731f5796c40dd366121b543d08217c5d3a63b36':
  Manual merge of changes from klp-dev