am 14077be0: IMS: Dont clean merge info on host termination
authorAnju Mathapati <anjucm@codeaurora.org>
Mon, 12 Oct 2015 17:12:25 +0000 (17:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Oct 2015 17:12:25 +0000 (17:12 +0000)
commit71ab9b45161aa59d648829592e347edd13930932
treef4faf1d856af92cb10ceae162c99cdda0922b6cc
parentad05a6594d092c53bb62791cee61e7c88e510031
parent14077be065f36916aceebcfab79f92024f4ed73c
am 14077be0: IMS: Dont clean merge info on host termination

* commit '14077be065f36916aceebcfab79f92024f4ed73c':
  IMS: Dont clean merge info on host termination