tree d49e1e4d0a8e97eed63883bd61b44bbaf05cfe73
parent 755bed4cc8ed20449f807feeff44e98c8b20c3ba
parent 4a91aa9b40d2bffdab04323d100fad3a0e3e6ecc
author Jean-Baptiste Queru <jbq@google.com> 1296147224 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296147224 -0800

am 4a91aa9b: (-s ours) Merge "Add a few more legacy modules that can have user tags - do not merge"

* commit '4a91aa9b40d2bffdab04323d100fad3a0e3e6ecc':
  Add a few more legacy modules that can have user tags - do not merge