am 2f387da0
: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '2f387da0ac1495f80ca5bc4c928e2b9c1e3fb040': Add HTC One special edition (DO NOT MERGE)
This commit is contained in:
commit
96c4627357