commit | 922e602b3ab6b0ea22b0f84e29bad1b8ffbe8a02 | [log] [tgz] |
---|---|---|
author | Fyodor Kupolov <fkupolov@google.com> | Thu Jan 29 20:56:45 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 20:56:45 2015 +0000 |
tree | 83a76e8a743f9ad3d2d9eb6418a3d964285d5910 | |
parent | d5363a1e3ca129fceed8a8b36de66611e4219819 [diff] | |
parent | b749c3368c0bd40a84026b44189e9119a0a27d15 [diff] |
am b749c336: am c4dba451: 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 'b749c3368c0bd40a84026b44189e9119a0a27d15':