Code

Merge android lib#1191

Code

Merged

m4gr3d merged 5 commits intoDroidPlanner:masterDroidPlanner/Tower:masterfrom m4gr3d:merge_android_libm4gr3d/droidplanner:merge_android_libCopy head branch name to clipboardOct 21, 2014

+123-947

Commits

Commits on Oct 21, 2014

• fixed issue 1179

  m4gr3d

  committed
  1a5ada2

  Copy full SHA for 1a5ada2

• Merge pull request DroidPlanner#1190 from ne0fhyk/fix_issue_1179

  Show description for ab01ae2
  m4gr3d

  committed
  ab01ae2

  Copy full SHA for ab01ae2

• merged android lib project back into the android project.

  m4gr3d

  committed
  7a62f38

  Copy full SHA for 7a62f38

• updated list of files to ignore.

  m4gr3d

  committed
  47337b8

  Copy full SHA for 47337b8

• update cleanup

  m4gr3d

  committed
  63de935

  Copy full SHA for 63de935