| commit | 2a87fe8c41338e746c6959d992edfeb9cb00bcc1 | [log] [tgz] |
|---|---|---|
| author | Winson <winsonc@google.com> | Fri Aug 07 10:37:21 2015 -0700 |
| committer | Winson <winsonc@google.com> | Fri Aug 07 10:37:21 2015 -0700 |
| tree | 74e0b6f6c9f53227e7a4a2abd26dadf5e4ed3123 | |
| parent | d84bcf1973bfd741a659db70efd3b27190980ba4 [diff] | |
| parent | 0ad330668462b9385900a7b1a163d536bbabc1a4 [diff] |
resolved conflicts for merge of 0ad33066 to ub-launcher3-master Change-Id: I5dbbaaf9fb03ed3003174154ea7d7dbae9048a70