Merge "add Kindle Fire contributor" into cm-10.2