tree 200e7913525a81445e03c9bbd9e208f161d73556
parent af614e0b09ba9ef358f82092fdbf04efb6fb1dc5
parent 5831a369566fa6a72cac8f4eda8206a6d79eb5c8
author Ying Wang <wangying@google.com> 1398860244 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398860244 +0000

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

* commit '5831a369566fa6a72cac8f4eda8206a6d79eb5c8':