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

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