tree 5e0bc04a4438e9d7390b6ee3f8133b4ef53e1b3b
parent 7b6b9a348470a2e688b6548cb0f44856d004e81c
parent b05db09060556ad629f4f687685123256744dbd1
author Andrew Lee <anwlee@google.com> 1414020368 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414020368 +0000

am b05db090: Merge "Hide/show Telephony video setting according to if IMS is enabled." into lmp-mr1-dev

* commit 'b05db09060556ad629f4f687685123256744dbd1':
  Hide/show Telephony video setting according to if IMS is enabled.