tree a092016e40fdaf9eefced33d81610c846b155e6e
parent 8e833972c2506267024136a0f609bdbb26dcc498
parent f246ae984baa133b93af4e14f94ba35990b43dbb
author Nick Kralevich <nnk@google.com> 1358543473 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358543473 -0800

am f246ae98: am 5496bbf6: Merge "Revert "Filter ANDROID_PROPERTY_WORKSPACE""

* commit 'f246ae984baa133b93af4e14f94ba35990b43dbb':
  Revert "Filter ANDROID_PROPERTY_WORKSPACE"