tree 7584a1b309e58ac4ed98d70dfa148e1d75decb14
parent 8213b719c8e5e4f757a4898213eb624622c11526
parent a660d06eeb9a53bc8d88fc2e559d461dc6a77d67
author Ying Wang <wangying@google.com> 1395000511 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395000511 +0000

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

* commit 'a660d06eeb9a53bc8d88fc2e559d461dc6a77d67':
  Don't modify LOCAL_STRIP_MODULE