am 2035fc54: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '2035fc54a53c541e00c1ca7357401950469fc458':
  Fix crash in Dialer in landscape mode
tree: b995952ac173dbdb3a753d25935e2ea6ea0c8bac
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags