Learn more about cloning repositories
You have read-only access
Merge remote-tracking branch 'origin/1.5' Conflicts: installerfw.pri Change-Id: I8bd85997fef0fcfa21a4dd28a6362748a54a4a3b
