| commit | d71b05d10b83b69730a5d9619d9e791b925a70d4 | [log] [tgz] |
|---|---|---|
| author | Jon Miranda <jonmiranda@google.com> | Mon Aug 28 21:15:34 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 28 21:15:34 2017 +0000 |
| tree | d079f20d40107acf9056d049817318e85ec44bbb | |
| parent | a882be08019415b4beab9269c7effa8fda051909 [diff] | |
| parent | 90c2336b6683461b29b91e2d150512028b0862a5 [diff] |
merged ub-launcher3-dorval-polish2, and resolved conflicts am: dff92fe1aa am: 90c2336b66 Change-Id: I9a27079f51ce2617d9e8d485ef69a38f9c41e56e