tree d46338c0a88f8abdf80c4bc75120f771fa63567c
parent f400051c3a6476154adf185399cb2ad8b2b16657
parent 83930bc3ee26001e18a3f708e05c0e967e21e559
author Fyodor Kupolov <fkupolov@google.com> 1422563951 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422563951 +0000

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 '83930bc3ee26001e18a3f708e05c0e967e21e559':