am 2c10d3a7: (-s ours) am c52a78cb: am 5dba48f2: DO NOT MERGE Fix NPE during activity recreation

* commit '2c10d3a70ef31d8e8e143f031dc50a8fe071c718':
tree: d480a9df18213d791f716ded764bcd22e74dbd2d
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags