OSDN Git Service

am cf698844: (-s ours) am 1edbc766: am 9a04435e: Merge "Compare tasks not activities."
authorCraig Mautner <cmautner@google.com>
Thu, 5 Dec 2013 22:34:42 +0000 (22:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Dec 2013 22:34:42 +0000 (22:34 +0000)
commitfb2cd2d78c25532d5e63999a84fc082f2326c85d
treeadb64c650885008a1b21eaedbeb3b9fc778f44aa
parentd081c81fc404066f35c1877faa9c6dbcac8a734e
parentcf698844634fd2dfd335ece8f907abb8de5fc414
am cf698844: (-s ours) am 1edbc766: am 9a04435e: Merge "Compare tasks not activities."

* commit 'cf698844634fd2dfd335ece8f907abb8de5fc414':