[automerger skipped] DO NOT MERGE Ensure that dialog fragment knows target fragment
am: bff2057623 -s ours
am skip reason: subject contains skip directive

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