| commit | 5743d870bd1c8281d90d424bdcd51792413592ae | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Tue Jan 19 13:00:08 2016 -0800 |
| committer | Sunny Goyal <sunnygoyal@google.com> | Tue Jan 19 13:01:20 2016 -0800 |
| tree | 6747b979740797a3260091bfe7d5b0bedf03ab90 | |
| parent | 3c0adb0729c0e8a63f745bdbe34448d358f21de8 [diff] | |
| parent | b56090af3546b268b92fab7aca96c267b223db5a [diff] |
resolve merge conflicts of b56090af35 to ub-launcher3-master. Change-Id: I2ef9a25b70815efe37109004517a7c3077ffa22e