tree cc23b8783f5c621d688b0015f30708d5ad2daa4e
parent 9eb695f0a3882845534094864821ed1cbfa22614
parent 51347595a3ea7749b2c771ac1e8f8f729a55e1a9
author Christoph Studer <chstuder@google.com> 1417730182 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417730182 +0000

am 51347595: am a6ecb61e: am c9660bdf: Merge "RankingHelper: Remove STOPSHIP" into lmp-mr1-dev

* commit '51347595a3ea7749b2c771ac1e8f8f729a55e1a9':
  RankingHelper: Remove STOPSHIP