[automerger skipped] DO NOT MERGE Add support for EFF/RTR to canhalsend am:...
[automerger skipped] DO NOT MERGE Add support for EFF/RTR to canhalsend am: 62bbf3dc am: c2ce095c am: fc56e668 am: 7f8855f5 -s ours
am skip reason: Change-Id I330b9d24c34918b38612ddc1745f019e11bfd474 with SHA-1 62bbf3dc is in history
Change-Id: I43abe18ab5f19d86a458c580e869e2c677e24a9a