| commit | 2d2b42ba3ced1a9b68124804f7b73e50359a4ea2 | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Fri Dec 04 10:04:54 2015 -0800 |
| committer | Sunny Goyal <sunnygoyal@google.com> | Fri Dec 04 10:04:54 2015 -0800 |
| tree | 403a541f7476eeed4df2e9af7bf9037c36ae44b4 | |
| parent | 9ec6d402fab5ec988a5c8cce10fb61df6acef31a [diff] | |
| parent | 39b700fcc501a5c9b2fb83d4b754fb24d43d5c49 [diff] |
resolve merge conflicts of 39b700fcc5 to ub-launcher3-master. Change-Id: I394258be0c75289cab2f5141c0fb765504527420