| commit | 1e978b7691f42cff46f91a01b9ee566b6a99f5ec | [log] [tgz] |
|---|---|---|
| author | Fyodor Kupolov <fkupolov@google.com> | Thu Jan 29 20:51:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 20:51:11 2015 +0000 |
| tree | 53834e66e70161cbe6d24f666fd0fcaf1d0359c9 | |
| parent | 56bc9f32004cd87d32c6ae0813cfdb570eef99fd [diff] | |
| parent | c4dba4513b22a59911bfee358c6537f53bbb89a7 [diff] |
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 'c4dba4513b22a59911bfee358c6537f53bbb89a7':