tree 01c011c8b7ad5086ce0256debed2748ce3ccc6be
parent a5522ceb95e98da7267888ae09a5464c0fd3866c
parent 8b3cb0d4cc6a22d712e27488f92a4a2ac06588d6
author Dmitri Plotnikov <dplotnikov@google.com> 1271295617 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1271295617 -0700

am 13932d85: am 5304d8fd: Merge "Introducing "strict project map"." into froyo

Merge commit '13932d85066f191db09c4a2fecfa563f0d63d7b7' into kraken

* commit '13932d85066f191db09c4a2fecfa563f0d63d7b7':
  Introducing "strict project map".