tree cb40a790990e9a2279549fd6180afc113f843f39
parent f6332cfaf2b64e0c7436bd80c8b9cb145c0ff5b1
parent 6e8b268dec3cc38151dfd0514621219b79a30fa9
author Jean-Baptiste Queru <jbq@google.com> 1284482647 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284482647 -0700

am 6e8b268d: Fail the build when using a user tag on a non-legacy module. do not merge

Merge commit '6e8b268dec3cc38151dfd0514621219b79a30fa9' into gingerbread-plus-aosp

* commit '6e8b268dec3cc38151dfd0514621219b79a30fa9':
  Fail the build when using a user tag on a non-legacy module. do not merge