[automerger skipped] DO NOT MERGE: Fix Dialer missing resource build breakage am: 5980f688d0 -s ours am: 2d4e625bc8

Change-Id: I946fa2f44a1ec9569670db039a3d96082dd6b569
tree: 1013576784cabdb2a854aa0eecf0f24d82b47578
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg