tree 74c888c4113f1eab05c98db11956894e28f4b134
parent 4228ed68c2cb70a2c79620619b4ef01cfcdc8a3d
parent 7793c09ec42bf1a01a5f45f0e723f9a36fcfd9d7
author Joe Onorato <joeo@google.com> 1345187804 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345187804 -0700

am 7793c09e: Merge changes I4e94b8b9,Iae48d489

* commit '7793c09ec42bf1a01a5f45f0e723f9a36fcfd9d7':
  Support for multiple modules with the same name is going away.
  Support for multiple modules with the same name is going away.