| commit | ecf9bf4613c6c307af1077b9a5c6c889da7d213b | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Wed Aug 19 14:16:41 2015 -0700 |
| committer | Sunny Goyal <sunnygoyal@google.com> | Wed Aug 19 14:16:41 2015 -0700 |
| tree | d4c7a0673a9a7f73668e752e4d7d1dbca69fde8c | |
| parent | 8382fdc735189969ecd97097568e9e495edfe1fb [diff] | |
| parent | 63aa46531ab202549f397c5370d08ca0453ccf93 [diff] |
resolved conflicts for merge of 63aa4653 to ub-launcher3-master Change-Id: I9fb7e452fdc646dc3d764d61d92755fa43edfa65