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