OSDN Git Service

am 8e9369f3: am 722581a5: (-s ours) Merge commit \'d54f8c2d1b4d88db84465fee93aa29103c...
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 6 Dec 2013 01:30:15 +0000 (01:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Dec 2013 01:30:15 +0000 (01:30 +0000)
commite67167f62e59e4be783d97e5f29e85b2fb813176
tree7a45a519c64b2a7c2fcd40160f64a6a4fc587ce8
parent48feb167d5064be1f12e856217d3f4358f324486
parent8e9369f3c2324aa0ee385ab7bffc10dbd590e5bb
am 8e9369f3: am 722581a5: (-s ours) Merge commit \'d54f8c2d1b4d88db84465fee93aa29103ca32078\' into HEAD

* commit '8e9369f3c2324aa0ee385ab7bffc10dbd590e5bb':