| commit | 886315de0ec25f8c45dabe31fe9c82fb07c6a409 | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Wed Jun 17 20:39:45 2015 -0700 |
| committer | Sunny Goyal <sunnygoyal@google.com> | Wed Jun 17 20:39:45 2015 -0700 |
| tree | 6a898f676f1ecae5bc4060e39e4b8f5011c662bd | |
| parent | 546bd3a8a4fe3d152c848d8f98f6702aa0b266d7 [diff] | |
| parent | dad45a7026868832404ecfb722407c685c0e8a13 [diff] |
resolved conflicts for merge of dad45a70 to ub-launcher3-master Change-Id: I901fc7850b246dc2dfa161454ac596f91945d277