| commit | 3533d3d0df1d54ffd66487494b14d06958cf2091 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Apr 27 18:52:58 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 27 18:52:59 2017 +0000 |
| tree | 6f1222331760dc5a743d606ebfdfc893bf2fa3a8 | |
| parent | 705402b4db5efc0cc09175d25e21db21765440ea [diff] | |
| parent | 09204172b33cf7fa88662f2871f872bf666822a4 [diff] |
Merge "[MANUAL] resolve merge conflicts of 59c0e0e91 to ub-launcher3-dorval-polish" into ub-launcher3-dorval-polish