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':
tree: 967f2714b7c695a2c8690d8099672ae2c639bbb8
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags