Code

Dev#17

Code

Open

yuzhiqiang1993 wants to merge 7 commits intomasteryuzhiqiang1993/zxing:masterfrom devyuzhiqiang1993/zxing:devCopy head branch name to clipboard

+6-10

Commits

Commits on Apr 4, 2018

• no message

  yuzhiqiang1993

  committed
  b19c692

• Merge branch 'master' into dev

  yuzhiqiang1993

  committed
  f556d91

Commits on Apr 9, 2018

• 关闭android.enableAapt2=true

  yuzhiqiang1993

  committed
  70cb4ae

• 尝试修复依赖报错

  yuzhiqiang1993

  committed
  064cd28

• no message

  yuzhiqiang1993

  committed
  7c52abf

• no message

  yuzhiqiang1993

  committed
  4713b26

• 解决合并的冲突

  yuzhiqiang1993

  committed
  c141917