am 18b94817: Merge "Also catch one more tablet layout NPE." into klp-dev

* commit '18b94817a452081f6756cd30be9414c496fa1ca7':
  Also catch one more tablet layout NPE.
tree: 976c0fa032085186693894f2a395cdac77c4ec00
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml