tree b0862341ea243748d1ef33f9906412eb2cb3e6dd
parent a02b00c592b1c1ef1a055b07e037479108030284
parent f90995451089db8e5d4a72641e74cf2e5c35074f
author Joe Onorato <joeo@google.com> 1345187904 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345187904 -0700

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

* commit 'f90995451089db8e5d4a72641e74cf2e5c35074f':
  Get rid of LOCAL_MODULE_TAGS := user