tree d0366a25e8d394f663b87c46e678725ddb00cbae
parent e54b6e67c7d9e814fddbb0ce4b3401e0d80f9077
parent 0808de11e83fdf12a51cc6f46bd4c54286b518cb
author scm <scm@thundersoft.com> 1429858809 +0800
committer scm <scm@thundersoft.com> 1429858809 +0800

Merge branch 'tmp-branch' into HEAD

* tmp-branch:
  FP2-272: Enable fastboot in all mode(user,userdebug,eng)
  FP2-262: [OTA]The device reboot looped after OTA update
  FP2-179: Update bootloader splash image
  FP2-148： rollback  FPII-102 modification to the default penguin logo
  FP2-102:phone power on logo - replace penguin with fairphone logo
  FP2-32： enable first logo in lk
  FP2-19: configure gpio 2 of pm8941 for volume down
  FP2-14: add support of lcd otm1902b panel in lk
  FP2-15: create Product ID for FP2 project