am 14077be0: IMS: Dont clean merge info on host termination
authorAnju Mathapati <anjucm@codeaurora.org>
Sun, 11 Oct 2015 17:19:53 +0000 (17:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 11 Oct 2015 17:19:53 +0000 (17:19 +0000)
commit0b7df2d5180cb8332f26ccc39e22fe04cc6d75cb
treeb78586a6bf9dd0d605423f15c8d55a1bc4a699b9
parent214168eaec6af438da3b63f079757f4fe0a9d759
parent14077be065f36916aceebcfab79f92024f4ed73c
am 14077be0: IMS: Dont clean merge info on host termination

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