Merge "Revert "Fix NPE from ListsFragment crash."" into mnc-dev
tree: 0b7e882f8cb6f9a4643fac65d46d538d7a1bd675
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags