OSDN Git Service

am de315ef3: (-s ours) am 621a6721: Merge commit \'957de9a560e24d120dfc76c4b2c1d72581...
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 30 Apr 2014 18:14:59 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:59 +0000 (18:14 +0000)
commit95550dcb0adf92c7f9e1b87420e2f63dc2cef403
tree3804e07840427a842ef1bdc750bffe2239123c26
parentf177a5c14054e17a64da59e1e702f74822874ef1
parentde315ef32fe0f7bf66d99c7ecf5bf63a122989cb
am de315ef3: (-s ours) am 621a6721: Merge commit \'957de9a560e24d120dfc76c4b2c1d72581a250fd\' into HEAD

* commit 'de315ef32fe0f7bf66d99c7ecf5bf63a122989cb':