tree be6636e1d54109d88682b2921a810fe77cb3bcc8
parent 05ef53b2aefe1ca91f83fc7b7c8ecc143b4912d4
parent a628c31f3f202215789f170020f7cb5f8c4bb274
author Ying Wang <wangying@google.com> 1392253896 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392253896 +0000

am a628c31f: am 08d60ceb: Merge "Use LOCAL_MODULE_RELATIVE_PATH to fix multilib build warning."

* commit 'a628c31f3f202215789f170020f7cb5f8c4bb274':
  Use LOCAL_MODULE_RELATIVE_PATH to fix multilib build warning.