tree 918c53ca7015ccffc122e15944f2c1ddcdf502fb
parent e7a302366ef4090a78e5d5217c01dcc9b9c5d226
parent 22af4ef1fdde630336349d298fd4cd1035f0f077
author Malcolm Chen <refuhoo@google.com> 1519794936 +0000
committer android-build-merger <android-build-merger@google.com> 1519794936 +0000

Merge "Disable certain mobile settings during phone call." am: e91a3a3f77 am: 952819079f
am: 22af4ef1fd

Change-Id: I9592d2b6e54eb53751123b7a744310ffdd96a80b