OSDN Git Service

am 30d68a3b: (-s ours) am 817f07ae: Fix the unstripped path if LOCAL_MODULE_PATH...
authorYing Wang <wangying@google.com>
Tue, 7 Sep 2010 17:32:32 +0000 (10:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Sep 2010 17:32:32 +0000 (10:32 -0700)
commitdea79b5c199ed139888cea5c3073df5f1453e2f4
tree0dd747b59629885efcac4fb9245a77ef7859fd39
parent8a08e8d1ab8b6ffe71b254620bd7a14a873dac91
parent30d68a3b9df5657ca0eefb063551202490a836fb
am 30d68a3b: (-s ours) am 817f07ae: Fix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE

Merge commit '30d68a3b9df5657ca0eefb063551202490a836fb'

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