Merge "Use correct P2P GO intent value" am: c4217f5100
am: a16b18f89c

Change-Id: Icdde0504702057b7fce7621ca961d3e0b00369dc
tree: b203158b6ff53fd3fe3697932fb150df9d54a96d
  1. service/
  2. PREUPLOAD.cfg