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

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