merge with upstream

diff --cc metadata/info.staticfree.android.units.txt
index a75fcdc9036a31a15646c2014db001c356ce2dd9,8a70c5f6817452cab88a8e6133af1d66be2cf948..b826203e97a66157bd8271bebdb3cbe3dd0faed2
--- 1/metadata/info.staticfree.android.units.txt
--- 2/metadata/info.staticfree.android.units.txt
+++ b/metadata/info.staticfree.android.units.txt
@@@ -12,9 -12,7 +12,12 @@@ Repo Type:gi
  Repo:git://staticfree.info/git/Units/
  Build Version:0.8,7,8be8c10c67152783b6871a70d077a0758e5086ba
  Build Version:0.9,8,3cde1f8d6b822ddcee23f984fab53e7bad3817df
 +Build Version:1.0,9,1db6cd055203bd2f15eaffd7a780db2ee22974af,target=android-10
  
  
++<<<<<<< HEAD
 +
++=======
++>>>>>>> upstream/master
  Market Version:1.0
  Market Version Code:9