Fix mismerge
1 file changed
tree: 50f683f7dbb8b2064a19bea6c4883a94d02d56cd
  1. assets/
  2. icons/
  3. res/
  4. src/
  5. TestCommon/
  6. tests/
  7. AndroidManifest.xml
  8. build.gradle