| commit | a37420cdc8eb5dfbc1ee117ad81d93a7c175aa4d | [log] [tgz] |
|---|---|---|
| author | Justin Klaassen <justinklaassen@google.com> | Wed Feb 15 17:23:08 2017 -0800 |
| committer | Justin Klaassen <justinklaassen@google.com> | Wed Feb 15 17:23:08 2017 -0800 |
| tree | 7c35dbd3aa33c7edaf3e8a09bdaf9a9c912025aa | |
| parent | b8c4512b4a6d3e78d426e7e67b502e4735e365cf [diff] | |
| parent | c640e2c46a3676d397545fa882388c6fa02a25b0 [diff] |
resolve merge conflicts of c640e2c46 to ub-deskclock-huddle Change-Id: I470ddbf6a1225809501ce573791031b5604b330a