commit | c268148f06f5c6c30deb1678e74530ef5aa85a67 | [log] [tgz] |
---|---|---|
author | Sunny Goyal <sunnygoyal@google.com> | Mon Aug 17 14:43:41 2015 -0700 |
committer | Sunny Goyal <sunnygoyal@google.com> | Mon Aug 17 14:43:41 2015 -0700 |
tree | ee179b0e3dd08c1c158e9dd761b10dd75fe37e0f | |
parent | 017a5c1e6524a0b93b7fdec1de7a49aaf1d04852 [diff] | |
parent | 9fc953b94dbc6b99e6de08c9dcc80a0cb8e3e319 [diff] |
resolved conflicts for merge of 9fc953b9 to ub-launcher3-master Change-Id: Ia3e845a2e336c846cceefdc2d1e8c6786753f1b1