tree 8bcb575ed6e1b5461db8cc55f85dde30734126b5
parent 7047b2f1214e709498cfe8e3c89ff53537f222ba
parent 385640ea7693db2ebaf42e1a2ad65d8af2ed5d69
author Amit Mahajan <amitmahajan@google.com> 1471046903 +0000
committer android-build-merger <android-build-merger@google.com> 1471046903 +0000

Merge "Call setFeatureValue() even if turning off IMS." into nyc-mr1-dev
am: 385640ea76

Change-Id: I58db58ca90bf4e2284f086ecb5ff9379a3160579