| commit | 383aa772d8089a9f60324d35dc7573be75189c92 | [log] [tgz] |
|---|---|---|
| author | Yorke Lee <yorkelee@google.com> | Wed Apr 30 12:50:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 12:50:14 2014 +0000 |
| tree | af39ceb9c6cb26c3ee1ea02c1e03de9a2486ac93 | |
| parent | cb7560111186540d1b0e2b824272c11ed019ce22 [diff] | |
| parent | f525270191829443cf36e77cdcb95a58bfa81d30 [diff] |
am f5252701: (-s ours) am 2c10d3a7: (-s ours) am c52a78cb: am 5dba48f2: DO NOT MERGE Fix NPE during activity recreation * commit 'f525270191829443cf36e77cdcb95a58bfa81d30':