[automerger skipped] DO NOT MERGE Ensure that dialog fragment knows target fragment am: bff2057623 -s ours
am: 6b8857ba5a

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