tree a9d1545741c85b136de6d336ae708d000a935597
parent dff92fe1aa90dfad1cce228ee140a70ab7a365b2
author Jon Miranda <jonmiranda@google.com> 1503959964 -0400
committer Jon Miranda <jonmiranda@google.com> 1504051822 -0400

Ensure no diffs b/w oc-mr1-dev and ub-launcher3-dorval-polish2.

This should ensure that all future code drops will be able to
merge cleanly.

Bug: 64937210
Test: Manual test
Change-Id: I4f7952d0e979402e120b29dc501ac7fff3de2879