tree 5a47fbd1f32859bd57a748ea77f8502c81ac1687
parent 17df905a9bd26ca34b4fc75e29671fc88c1f7f1b
parent ca88861ba6ede0e577d92c1ed103fd4acd3fc0ba
author Ying Wang <wangying@google.com> 1277941022 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277941022 -0700

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

Merge commit 'ca88861ba6ede0e577d92c1ed103fd4acd3fc0ba' into gingerbread-plus-aosp

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