| commit | 1b6695988e0e78118803af87b9740cf909e06f8a | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Thu Mar 03 21:55:25 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Mar 03 21:55:25 2016 +0000 |
| tree | 9d2bed02cc699b02d5b24ca983a1e2d3e577fa79 | |
| parent | 8eb5b17877138e80b5ff59d29d11165e90eb5a66 [diff] | |
| parent | 97660f7a9421b4d9068183b6fb1ec107df8c7946 [diff] |
resolve merge conflicts of 2494c3f168 to ub-launcher3-calgary am: 97660f7a94 * commit '97660f7a9421b4d9068183b6fb1ec107df8c7946': Moving createMarketSearchIntent to search controller to allow it to be customizable