Merge \\"Append product and device parameters to download url.\\" into nyc-mr1-dev am: 2a3b0c67c7
am: 25570807eb

Change-Id: I30e91ad34180888eee453f01aac1fea9fb30e4fa
tree: 65b1a0da46bea4fec3add40121c9079244bd0b95
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml