tree 4be2223aec08580371208fd794d1d1c52b6f7c4c
parent e7c0ad103cda468a2a339231641c2ea701fe5138
parent 6b747cfb21e270598c0d1bf1923c4da768a676a8
author Jean-Baptiste Queru <jbq@google.com> 1283967499 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283967499 -0700

am 6b747cfb: (-s ours) am a90f9d2c: Merge "Warn when new modules are found that use user tags - DO NOT MERGE" into gingerbread

Merge commit '6b747cfb21e270598c0d1bf1923c4da768a676a8'

* commit '6b747cfb21e270598c0d1bf1923c4da768a676a8':
  Warn when new modules are found that use user tags - DO NOT MERGE