| commit | fe8a39d8b0750a332787abbe1a210fb55e444223 | [log] [tgz] |
|---|---|---|
| author | Jon Miranda <jonmiranda@google.com> | Mon Aug 28 18:39:24 2017 -0400 |
| committer | Jon Miranda <jonmiranda@google.com> | Tue Aug 29 20:10:22 2017 -0400 |
| tree | a9d1545741c85b136de6d336ae708d000a935597 | |
| parent | dff92fe1aa90dfad1cce228ee140a70ab7a365b2 [diff] |
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