tree 74c888c4113f1eab05c98db11956894e28f4b134
parent a1eb5708e9fa0ec1389704a3356547f8132fd47c
parent 781c3404311c081a4f41f15628851aeede0172d6
author Joe Onorato <joeo@google.com> 1345187948 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345187948 -0700

am 781c3404: am 7793c09e: Merge changes I4e94b8b9,Iae48d489

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