tree 93f4b6dc156f70ac024b694549194185df55e5ee
parent 5eea80bd48ba5cb560895f5cdf6674129f1942cf
parent 958d241f1f10523da56e018772acd3c2441a9701
author Ying Wang <wangying@google.com> 1398819534 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398819534 +0000

am 958d241f: am 6613e27d: Merge "Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH"

* commit '958d241f1f10523da56e018772acd3c2441a9701':