tree b0862341ea243748d1ef33f9906412eb2cb3e6dd
parent a3a2260384a906e1674c7498c2f479e9f37bc503
parent 7a659da9ec67d85d1b166fc6c1984f488de8e031
author Joe Onorato <joeo@google.com> 1345187517 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345187517 -0700

am 7a659da9: Merge "Get rid of LOCAL_MODULE_TAGS := user"

* commit '7a659da9ec67d85d1b166fc6c1984f488de8e031':
  Get rid of LOCAL_MODULE_TAGS := user