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

* commit '383aa772d8089a9f60324d35dc7573be75189c92':
tree: 51cd24518b1e35875755d3f2a1b01d969afbd2d2
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags