OSDN Git Service

am 38ede6d7: am 9bc59c20: (-s ours) Merge commit \'457e9215df2a8353f484a268950623d714...
authorGeoff Mendal <mendal@google.com>
Wed, 29 Oct 2014 07:07:51 +0000 (07:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Oct 2014 07:07:51 +0000 (07:07 +0000)
commit5dd8165f9b9b8cea8bb6fe1f6bfc34fdee65fef9
tree10da860fcff71886af91d082e31f0e1917926848
parent38e7a056009c77f18e08f1da31c944d5c374c361
parent38ede6d74bf3b70e86a6eb99307dae79df45976e
am 38ede6d7: am 9bc59c20: (-s ours) Merge commit \'457e9215df2a8353f484a268950623d714afa01c\' into klp-dev-plus-aosp

* commit '38ede6d74bf3b70e86a6eb99307dae79df45976e':