| commit | 3c938a7e0dfa6289bba557164f629873a230bd5c | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Tue Aug 04 10:33:30 2015 -0700 |
| committer | Sunny Goyal <sunnygoyal@google.com> | Tue Aug 04 10:33:30 2015 -0700 |
| tree | 18979a36705a89414207fba10c489cae6a80be94 | |
| parent | 488d4bdf26fb8cefd4f2f83535fde1b07202b545 [diff] | |
| parent | 3f7550c1edb2a8db85e2c2db4333c9cd458e259b [diff] |
resolved conflicts for merge of 3f7550c1 to ub-launcher3-master Change-Id: I3bb155473d48832e496a8983f84c20e6e935fa41