tree 1d59fd7ec18269a6df9aaa4a859eeb5395b242b9
parent 22d019b51d78684efc7fda70063a586e3e5ba8ea
parent 783f449bdc0fe8aa9f2385c22bb0831fa3d5d1c9
author Ying Wang <wangying@google.com> 1277940892 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277940892 -0700

am 783f449b: Don\'t copy apns-conf.xml for apps-only build

Merge commit '783f449bdc0fe8aa9f2385c22bb0831fa3d5d1c9' into gingerbread

* commit '783f449bdc0fe8aa9f2385c22bb0831fa3d5d1c9':
  Don't copy apns-conf.xml for apps-only build