tree fe729042aa91b134a033766e6c254ecb7b37e239
parent 8d8bf8a7240ecb5486a94710cec945a8bda6b156
parent e623fa221d73a5337b2fb38f1bb501ee8a3f4b10
author Scott Kennedy <skennedy@google.com> 1378247233 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378247233 -0700

am e623fa22: Merge "Preserve advertiser name" into jb-ub-mail-ur10

* commit 'e623fa221d73a5337b2fb38f1bb501ee8a3f4b10':
  Preserve advertiser name