tree 68bba7c5e88540ed673e13c011aa506b897555e6
parent 472d0595e9f66f647e387590b6c3ec759d809ab0
parent 6cc89747ec0c5a553a99acd9be14eb9eaac1c89f
author Ying Wang <wangying@google.com> 1387393178 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387393178 +0000

am 6cc89747: am 8e3a71f7: Merge "Simplify the calculation of LOCAL_UNSTRIPPED_PATH"

* commit '6cc89747ec0c5a553a99acd9be14eb9eaac1c89f':
  Simplify the calculation of LOCAL_UNSTRIPPED_PATH