| commit | dc893151f0b5fc751a2bfc77946f833a985cc78f | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Mon Nov 30 10:19:02 2015 -0800 |
| committer | Sunny Goyal <sunnygoyal@google.com> | Mon Nov 30 10:19:02 2015 -0800 |
| tree | 23787a4b6d79e962cf6fc1c2fb15c1552f9cd0df | |
| parent | b23bb416d0ad2d21eab495afb3dc0237c8d81d45 [diff] | |
| parent | 0c2f0700a55080318a4c21457408abb8af26740d [diff] |
resolve merge conflicts of 0c2f0700a5 to ub-launcher3-master. Change-Id: I92f38e9f4ac4d9b6c5a3000e0971d2bc417bd3c6