| commit | 6a9d5502efa9f678690fb3e86b96363f89042580 | [log] [tgz] |
|---|---|---|
| author | Fyodor Kupolov <fkupolov@google.com> | Thu Jan 29 21:02:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 21:02:14 2015 +0000 |
| tree | 3815cebd603237078da1eb6c3abe5e15c704167d | |
| parent | 2b3591db4d11b936c44e771cea9e7436e0e9ce4b [diff] | |
| parent | 922e602b3ab6b0ea22b0f84e29bad1b8ffbe8a02 [diff] |
am 922e602b: 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 '922e602b3ab6b0ea22b0f84e29bad1b8ffbe8a02':