diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-03-27 01:39:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-27 01:39:25 +0000 |
| commit | 0eb54f05dd30e902260a95faaac949f7b4236951 (patch) | |
| tree | dcc962bd1e2755818f4e8ff12442de0ddf8425df /src | |
| parent | a2042339c3a9f5b987b95f387e80dde10d7e5e6a (diff) | |
| parent | b6da8359edb3ffe13e239793fdfec84f13d70127 (diff) | |
am b6da8359: am f20d7c10: (-s ours) am da602a82: resolved conflicts for merge of 6503dc1a to klp-modular-dev
* commit 'b6da8359edb3ffe13e239793fdfec84f13d70127':
DO NOT MERGE Fix crash when recreating activity and receiving dial intent
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions