am 51f8afe0: Merge 81275140

* commit '51f8afe09494ef30356672cacbb48ce3c130af9a':
  [sample] change apns-full-conf.xml