tree daf4713fb4c751842354348b3b35b49b5b53d5bf
parent 9314823c06d4434bf18d589c2fdea490428becf8
parent 817f07aef008dd3f32fed3603382123917fdec64
author Ying Wang <wangying@google.com> 1283880574 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283880574 -0700

am 817f07ae: Fix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE

Merge commit '817f07aef008dd3f32fed3603382123917fdec64' into gingerbread-plus-aosp

* commit '817f07aef008dd3f32fed3603382123917fdec64':
  Fix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE