| commit | bda3ff8f20b30412d8e7c6d3a48a26078e66d6b2 | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Wed Feb 03 11:41:36 2016 -0800 |
| committer | Sunny Goyal <sunnygoyal@google.com> | Wed Feb 03 11:41:36 2016 -0800 |
| tree | 6000309e49b8319b1760c7bf7934db97ef20ff9a | |
| parent | 3c4906949f9d7a978caa5ffe9dfe8e6e153876ef [diff] | |
| parent | 0e0498031092488ff166145c12ce36cc0a80c490 [diff] |
resolve merge conflicts of 0e04980310 to ub-launcher3-calgary. Change-Id: Ic4526dfc388590aa0288936d827f19060922529f