Add Merge side unspecified

Fix: 133795435
Fix: 139107163
Test: Manual

Change-Id: I11e52b13303d182349d7344f901d31de8b24f132
4 files changed
tree: 966e55b4a163deabc129b0e2dbdd79fc18c93f8a
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml