tree 693060a9ca89e8121ae0cef834657e63d083ad82
parent d242b4434f58aa95805181fecc05ccf60bba6d03
parent 1b5ecdc7bb55511066c0c05395035f3a816e82b6
author Joe Onorato <joeo@google.com> 1345187520 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345187520 -0700

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

* commit '1b5ecdc7bb55511066c0c05395035f3a816e82b6':
  Get rid of LOCAL_MODULE_TAGS := user