summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/app
diff options
context:
space:
mode:
authorerfanian <erfanian@google.com>2017-07-10 11:36:38 -0700
committerEric Erfanian <erfanian@google.com>2017-07-10 13:36:03 -0700
commit503b8f44e36ca00b9b5797f637023b9f743dc9dd (patch)
tree42eac0a5d376c3b23378fea7c86ba56f7735c4ab /java/com/android/dialer/app
parent64da818099b47d252d5fdd75fe910b062b3ddf31 (diff)
Update merge strategy. The legacy strategy is deprecated.
* Don't allow cleartext traffic in the voicemail module. This was being overridden, anyway. Bug: 62339559 Test: See below. PiperOrigin-RevId: 161418474 Change-Id: Icd945902ed089bf37b43d93d8fe32983a9f88fea
Diffstat (limited to 'java/com/android/dialer/app')
0 files changed, 0 insertions, 0 deletions