GPII-98 Adding android.json stub, needed to allow logging in without error.
Device Reporter, Solutions, Preferences for WSIS and Google I/O Demos
Merge branch 'google-io' into GPII-120
GPII-120 putting development configs back the way they were. Fixing android device listing file name to match conventions from other platforms.
GPII-120 Fixing up formatting
GPII-120 Trying to get back the existing non end of file newline
Merge remote-tracking branch 'origin/master' into GPII-120
GPII-120 Removing duplicate profile maguro
GPII-120 Adding android solutions to installedSolutions.json
GPII-189: Move to the newest infusion's model transformations
Merge remote-tracking branch 'upstream/v0.2' into GPII-120_cont
GPII-120: Updating android_installedSolutions.json according to the new API
Merge remote-tracking branch 'javihernandez/GPII-120_cont' into v0.2

* javihernandez/GPII-120_cont:
  GPII-120: Updating android_installedSolutions.json according to the new API
  GPII-189: Move to the newest infusion's model transformations
  GPII-120 Adding android solutions to installedSolutions.json
  GPII-120 Removing duplicate profile maguro
  GPII-120 Trying to get back the existing non end of file newline
  GPII-120 Fixing up formatting
  GPII-120 putting development configs back the way they were. Fixing android device listing file name to match conventions from other platforms.
  Device Reporter, Solutions, Preferences for WSIS and Google I/O Demos
  GPII-98 Adding android.json stub, needed to allow logging in without error.