tree c24b6586fa21b92f050b140c1a04834909fda173
parent 6d8f9749ffdb9b8ef87c09123d0dc476f069cd84
parent 51f8afe09494ef30356672cacbb48ce3c130af9a
author Jean-Baptiste Queru <jbq@google.com> 1354579378 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354579378 -0800

am 51f8afe0: Merge 81275140

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