am b028ce55: Merge "Add a protocol property to the APNs and use it." into gingerbread

* commit 'b028ce55cac88f1778cdad59c63c52a5b66afb69':
  Add a protocol property to the APNs and use it.