tree f3d83a87b64b48e6e625163f165d605ecfab945a
parent 8828537f61979a90bf8a48d041cecab3e8b7b598
parent 4d5f69f20e636523d69574d2f2073c998226eb8a
author Tom O'Neill <tomo@google.com> 1410205744 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410205744 +0000

am ac4e15e7: am 8fff150b: Merge "Fix a STOPSHIP" into lmp-dev

* commit 'ac4e15e74d02cb75bac21e6c406e6b270e08a810':
  Fix a STOPSHIP