| commit | 503b8f44e36ca00b9b5797f637023b9f743dc9dd | [log] [tgz] |
|---|---|---|
| author | erfanian <erfanian@google.com> | Mon Jul 10 11:36:38 2017 -0700 |
| committer | Eric Erfanian <erfanian@google.com> | Mon Jul 10 13:36:03 2017 -0700 |
| tree | 42eac0a5d376c3b23378fea7c86ba56f7735c4ab | |
| parent | 64da818099b47d252d5fdd75fe910b062b3ddf31 [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