tree 693060a9ca89e8121ae0cef834657e63d083ad82
parent 3b839df93425cda57532bbc60784dd26c5e1d028
parent 85bdf7e6fd82d68aa4f917e234bf525968c5fc66
author Joe Onorato <joeo@google.com> 1345187916 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345187916 -0700

am 85bdf7e6: am 1b5ecdc7: am 47869b6e: Merge "Get rid of LOCAL_MODULE_TAGS := user"

* commit '85bdf7e6fd82d68aa4f917e234bf525968c5fc66':
  Get rid of LOCAL_MODULE_TAGS := user