tree d0ab9a35b6d5c8375a5681ad3c7948345e7dedb5
parent cbbdea01c34ae938252a2a401f85d80604895393
parent 8cb33a3095dc7a7ff7c55aaf6c735007729e0b87
author 王晓良 <wangxl@thundersoft.com> 1444472130 +0800
committer Gerrit Code Review <scmadmin@thundersoft.com> 1444472130 +0800

Merge changes I704b2924,I14bfc166 into fp2-dev-v2

* changes:
  FP2-1374: FP2 OS Translations
  FP2-1431: Privacy Impact needs whitelist for CTS