| commit | b6da8359edb3ffe13e239793fdfec84f13d70127 | [log] [tgz] |
|---|---|---|
| author | Yorke Lee <yorkelee@google.com> | Thu Mar 27 01:35:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 27 01:35:43 2014 +0000 |
| tree | abbeb70bbfbb2239e5cf5716d0a75e6da46db93c | |
| parent | 06107886477be724c055b3e151d2988768839a6b [diff] | |
| parent | f20d7c10a45b5e1cdb044c6d6cefeb6b8e88a21e [diff] |
am f20d7c10: (-s ours) am da602a82: resolved conflicts for merge of 6503dc1a to klp-modular-dev * commit 'f20d7c10a45b5e1cdb044c6d6cefeb6b8e88a21e': DO NOT MERGE Fix crash when recreating activity and receiving dial intent