OSDN Git Service

am b26bec1a: am 83930bc3: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4...
authorFyodor Kupolov <fkupolov@google.com>
Thu, 29 Jan 2015 20:46:13 +0000 (20:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Jan 2015 20:46:13 +0000 (20:46 +0000)
commitc4dba4513b22a59911bfee358c6537f53bbb89a7
tree62bcdf6179577fd92e4740b903270dd0bec9663b
parentac840cd91b77c0a37723723a9d6101beec53bcd1
parentb26bec1a6fd7c03d667d7fa83bffd0ee8afb7b3e
am b26bec1a: am 83930bc3: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started automerge: 3a3ff59 automerge: 5b2b7e1

* commit 'b26bec1a6fd7c03d667d7fa83bffd0ee8afb7b3e':