commit | 5a78ad8ce88a12f67de288139a18eff7d311b437 | [log] [tgz] |
---|---|---|
author | Hyunyoung Song <hyunyoungs@google.com> | Wed May 31 21:35:18 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed May 31 21:35:18 2017 +0000 |
tree | 6d73583269d3a10f93356e10fcfc1ccb15166641 | |
parent | f5247179d6b223f17b25c5f4671a1c60cfac6610 [diff] | |
parent | 6958fda4ad3a9b573a563bb908def3114424421e [diff] |
merged ub-launcher3-dorval, and resolved conflicts Test: $ make -j 32 dist checkbuild Bug: 62196967 am: 69a49c1d24 am: 6958fda4ad Change-Id: I1e6e94887d6104166a6fef3d0709cd7ea40432a1