tree d46338c0a88f8abdf80c4bc75120f771fa63567c
parent 6355e1152ab29735721c40cfab6431a65341218b
parent 9e432a698b6422118c2cc0d0a6c12194c9d1fc32
author Fyodor Kupolov <fkupolov@google.com> 1422560111 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422560111 +0000

am 9e432a69: am d7e93570: am f11f9f47: Added a check if a custom activity can be started automerge: 57641a8 automerge: 0738bae

* commit '9e432a698b6422118c2cc0d0a6c12194c9d1fc32':