am c52a78cb: am 5dba48f2: DO NOT MERGE Fix NPE during activity recreation

* commit 'c52a78cba9ea666a0a91c372943862cbfdd35caf':
  DO NOT MERGE Fix NPE during activity recreation
tree: 6470110e0fcfdd769d65cf362869376f89cf623f
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags