OSDN Git Service

am f400051c: am 9e432a69: am d7e93570: am f11f9f47: Added a check if a custom activit...
authorFyodor Kupolov <fkupolov@google.com>
Thu, 29 Jan 2015 19:42:06 +0000 (19:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Jan 2015 19:42:06 +0000 (19:42 +0000)
* commit 'f400051c3a6476154adf185399cb2ad8b2b16657':


Trivial merge