tree a48a943f7d0dec3091778da835c891b928479d16
parent f37a4c8c6554b091b738e085eeee7cf4acd7084d
parent 6c25708eb5b1980445213b7b30cc9d6dad16b7f1
author Julian Odell <juliano@google.com> 1409786571 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409786571 +0000

am 45ae7fb1: Merge "Bug 17262099: MMS API changes (multi-project)." into lmp-dev

* commit '45ae7fb1d9981f9b17871c30e210db2a10d19075':
  Bug 17262099: MMS API changes (multi-project).