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

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