tree 0852ccdece364155556a4f7ec4d738fb43b9a50b
parent 3252e4277c7dc66310757ee7cff4533dc7d3db3c
parent 4190612ab12c0441dd91e8f6269f2340a497bb8e
author scm <scm@thundersoft.com> 1430099306 +0800
committer scm <scm@thundersoft.com> 1430099306 +0800

Merge branch 'tmp-branch' into HEAD

* tmp-branch:
  FP2-90: european language support
  FP2-84: remove the default build id
  FP2-84: remove the default build id
  FP2-033: Make OTA packages rollback-compatible
  FP2-15: create Product ID for FP2 project

Conflicts:
	core/build_id.mk

Change-Id: I521971c0df9567eadb9f29efaca7781012ad2fa8