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

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