OSDN Git Service

am 9bc59c20: (-s ours) Merge commit \'457e9215df2a8353f484a268950623d714afa01c\'...
authorGeoff Mendal <mendal@google.com>
Thu, 23 Oct 2014 19:33:01 +0000 (19:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Oct 2014 19:33:01 +0000 (19:33 +0000)
commit38ede6d74bf3b70e86a6eb99307dae79df45976e
treecba62d0d64153aa2169651696bc238591341d679
parent253e9df603d89af35765629b9e3fe14283295653
parent9bc59c20d0bc0683c537560ea92c581eeaf1ebe9
am 9bc59c20: (-s ours) Merge commit \'457e9215df2a8353f484a268950623d714afa01c\' into klp-dev-plus-aosp

* commit '9bc59c20d0bc0683c537560ea92c581eeaf1ebe9':