tree 0edaacae9ecfff743cb7b24820a8fbd1b52a29b3
parent c940c38242e8e0265db25a646ad63263934f2bb9
parent 8dad284a8ac588ef0be92c6a467e525f07c164cd
author Colin Cross <ccross@android.com> 1392340384 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392340384 +0000

am 8dad284a: am 80b72e6f: Merge "libeffects: don\'t set module path"

* commit '8dad284a8ac588ef0be92c6a467e525f07c164cd':
  libeffects: don't set module path