commit | 72271673520c0faab8b34b55f7758130c306e15e | [log] [tgz] |
---|---|---|
author | Yorke Lee <yorkelee@google.com> | Tue May 13 23:48:58 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 23:48:58 2014 +0000 |
tree | 967f2714b7c695a2c8690d8099672ae2c639bbb8 | |
parent | 0b8d5bf44c55832b784577c671654482fd1732ab [diff] | |
parent | 7337e5683be2231ba34f9832ea91243183c5ef58 [diff] |
am 7337e568: (-s ours) am 85beee28: am a0adfeda: (-s ours) am daa10f99: am 9b400d81: am c52a78cb: am 5dba48f2: DO NOT MERGE Fix NPE during activity recreation * commit '7337e5683be2231ba34f9832ea91243183c5ef58':