| commit | cfbc09aaee399fdf3441930de542853019a6e013 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Mar 31 19:41:18 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Mar 31 19:41:18 2017 +0000 |
| tree | fa2201103038df5bca59cec32e3bfb0d2ba40df4 | |
| parent | 67a25e6ff1d7a3cdfbd73a46b792b3eb7abb9d0e [diff] | |
| parent | ca4e6b4b5964a8024296fb5de0afd82f6dbe3e4d [diff] |
Merge "resolve merge conflicts of 26b174659 to ub-launcher3-master" into ub-launcher3-master