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

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