OSDN Git Service

am 722581a5: (-s ours) Merge commit \'d54f8c2d1b4d88db84465fee93aa29103ca32078\'...
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 6 Dec 2013 01:24:53 +0000 (17:24 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Dec 2013 01:24:53 +0000 (17:24 -0800)
* commit '722581a59873a98d30f7af34300049d524c1783f':


Trivial merge