tree 0314767fc8e8ed0da82e11684bf059bba66dbb7c
parent 6e92ade0a6cd8aea8f074fdc44f375ef2f1d50b7
parent 1cda15d3234a502ba7332b56a7bbecca228731cf
author Ying Wang <wangying@google.com> 1395000299 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1395000299 -0700

am 1cda15d3: Merge "Don\'t modify LOCAL_STRIP_MODULE"

* commit '1cda15d3234a502ba7332b56a7bbecca228731cf':
  Don't modify LOCAL_STRIP_MODULE