| commit | f20d7c10a45b5e1cdb044c6d6cefeb6b8e88a21e | [log] [tgz] |
|---|---|---|
| author | Yorke Lee <yorkelee@google.com> | Thu Mar 27 01:07:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 27 01:07:52 2014 +0000 |
| tree | c0a1bfd12f25b2958ad1efad5408083681b190c9 | |
| parent | 54ff084bbf3ae85e6454aff22f8c16570066ec52 [diff] | |
| parent | da602a829d0a1325aa23132705b7c1f564f09bcd [diff] |
am da602a82: resolved conflicts for merge of 6503dc1a to klp-modular-dev * commit 'da602a829d0a1325aa23132705b7c1f564f09bcd': DO NOT MERGE Fix crash when recreating activity and receiving dial intent