am d71297d2: (-s ours) Reconcile with klp-release - do not merge

* commit 'd71297d287929fffe5c58a2a9139a11f3ca56978':
  Fix crash in onPrepareOptionsMenu
  Fix Dialer crash due to incorrect viewtype count being reported
tree: 3d9aca65ea068f6daa982c9b0eab3f51ff6ab525
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags