tree 666365696e4e09618e4cc6d56e571f6c767b3d0f
parent 8f802e569b1185ea33ebf6f800f3c52ce51913c8
parent 2c9e137fabc8c1ff5e0576ed18aaccc22859b517
author Julian Odell <juliano@google.com> 1409788007 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409788007 +0000

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

* commit '2627e56c900389e374fc6599a09e5eda97dd8b74':
  Bug 17262099: MMS API changes (multi-project).