tree df365d6114eb17903e3b36d1580e04bd018e983e
parent b989c9ceda71f6f75112645b5c45af341275cbab
parent 30894bdfd6e4c74ab673d47391e62fb14fb51381
author Nick Kralevich <nnk@google.com> 1358371883 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358371883 -0800

am 30894bdf: am 1b34228b: Merge "Filter ANDROID_PROPERTY_WORKSPACE"

* commit '30894bdfd6e4c74ab673d47391e62fb14fb51381':
  Filter ANDROID_PROPERTY_WORKSPACE