| commit | 56026e3065b2450b9f1ffa6c5f75ef5c0f67e3c1 | [log] [tgz] |
|---|---|---|
| author | maxwelb <maxwelb@google.com> | Tue Jul 25 12:48:49 2017 -0700 |
| committer | Eric Erfanian <erfanian@google.com> | Tue Jul 25 14:00:26 2017 -0700 |
| tree | 1767fba754a11130efffa3e9426c0812619d8c78 | |
| parent | 5b83320cf9cc718a8665ef7c3bc1fc0026560608 [diff] |
Automated g4 rollback of changelist 161418474. *** Reason for rollback *** Checking if this broke the uses-library value for pixel devices *** Original change description *** 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: 163109133 Change-Id: Id04c51bf3fcb66314c7b27ad96d38b3cae0df230