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

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