[Ssc-dev] [guardianproject/InformaCore] 2ef391: Merge branch 'master' of github.com:guardianprojec...

[harlo]

  Branch: refs/heads/harlo_task_2290
  Home:   https://github.com/guardianproject/InformaCore
  Commit: 2ef391ccc5dd9b13adb7c28d81369a0644ce161b
      https://github.com/guardianproject/InformaCore/commit/2ef391ccc5dd9b13adb7c28d81369a0644ce161b
  Author: harlo <LvH at VIDEOCLASH.local>
  Date:   2013-11-03 (Sun, 03 Nov 2013)

  Changed paths:
    M external/google-play-services_lib/project.properties
    M project.properties
    M src/org/witness/informacam/informa/InformaService.java
    M src/org/witness/informacam/informa/suckers/AccelerometerSucker.java
    A src/org/witness/informacam/informa/suckers/EnvironmentalSucker.java
    M src/org/witness/informacam/informa/suckers/PhoneSucker.java
    M src/org/witness/informacam/models/forms/IForm.java
    M src/org/witness/informacam/models/j3m/IDCIMDescriptor.java
    M src/org/witness/informacam/utils/Constants.java

  Log Message:
  -----------
  Merge branch 'master' of github.com:guardianproject/InformaCam


  Commit: 75d9fa850fb581f1d0211660bc2f0629b9af9d8d
      https://github.com/guardianproject/InformaCore/commit/75d9fa850fb581f1d0211660bc2f0629b9af9d8d
  Author: harlo <LvH at VIDEOCLASH.local>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M proguard-project.txt
    M src/org/witness/informacam/transport/GlobaleaksTransport.java
    A src/org/witness/informacam/transport/GoogleDriveTransport.java
    M src/org/witness/informacam/transport/Transport.java
    M src/org/witness/informacam/utils/Constants.java

  Log Message:
  -----------
  stubs for google drive transport


Compare: https://github.com/guardianproject/InformaCore/compare/2ef391ccc5dd^...75d9fa850fb5