tree 33680646e6928a57abcbaacf1396f69db55379ea
parent 0f476935fe6ffa3715559b546cb5c1d79040d080
parent 59b5630581db18cd56c91ba563dcfd7c07ba82d9
author Sailesh Nepal <sail@google.com> 1416937759 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416937759 +0000

am 59b56305: am f211f688: Merge "Hide call assistant configure item if necessary" into lmp-mr1-dev

* commit '59b5630581db18cd56c91ba563dcfd7c07ba82d9':
  Hide call assistant configure item if necessary