am 362da509: (-s ours) am b028ce55: Merge "Add a protocol property to the APNs...
am 362da509: (-s ours) am b028ce55: Merge "Add a protocol property to the APNs and use it." into gingerbread
* commit '362da509':
Add a protocol property to the APNs and use it.