commit | fdf61704bc92ccdcb4806635ad35caf717a1cd51 | [log] [tgz] |
---|---|---|
author | Yorke Lee <yorkelee@google.com> | Wed May 14 00:07:38 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 14 00:07:38 2014 +0000 |
tree | c2175942e3a631ad112fe6ab17da560c45fc1ae2 | |
parent | ba5da60e62a1bea48bb6f240be117d8a09a967a2 [diff] | |
parent | e928594c059dc5c20bf30266a06b7e64a9585003 [diff] |
am e928594c: (-s ours) am 383aa772: am f5252701: (-s ours) am 2c10d3a7: (-s ours) am c52a78cb: am 5dba48f2: DO NOT MERGE Fix NPE during activity recreation * commit 'e928594c059dc5c20bf30266a06b7e64a9585003':