tree 6fa54b7cf26a96c342449a297524f4e57d406bef
parent 54b1a485266a175dffd78a5aae7c5426cb5131b1
parent 0f476935fe6ffa3715559b546cb5c1d79040d080
author Sailesh Nepal <sail@google.com> 1416938467 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416938467 +0000

am 0f476935: am addca877: am 7258f5c5: Merge "Simplify call assistant setting" into lmp-mr1-dev

* commit '0f476935fe6ffa3715559b546cb5c1d79040d080':
  Simplify call assistant setting