tree dea65fed7d10c91605ab27f9aa549a9446a70392
parent 8ba93799bb7c073cea01b73296edfbc3b3a5ba43
parent 0b020958a9549926a720890c1bfe550a82e9199d
author Andreas Gampe <agampe@google.com> 1437098445 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437098445 +0000

am 0b020958: am 9cf822d1: am 25b2ed03: Merge "Installd: Add a swap override flag"

* commit '0b020958a9549926a720890c1bfe550a82e9199d':
  Installd: Add a swap override flag