am 85beee28: am a0adfeda: (-s ours) am daa10f99: am 9b400d81: am c52a78cb: am 5dba48f2: DO NOT MERGE Fix NPE during activity recreation

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