tree 8578224331b4c701b977596ad2b914aa466b5496
parent 591d9a3652f868652ccc48dd9e9714f3a9813963
parent e0a76795125a81471c408d4a23112e98ae2f0ae3
author Ying Wang <wangying@google.com> 1393443343 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393443343 +0000

am e0a76795: am 5969b408: Merge "Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH"

* commit 'e0a76795125a81471c408d4a23112e98ae2f0ae3':
  Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH