| commit | 17b1c2cf9a2e049ca1f2e4839c4cfaba6028d1fc | [log] [tgz] |
|---|---|---|
| author | Todd Kennedy <toddke@google.com> | Wed Nov 18 15:38:28 2015 -0800 |
| committer | Todd Kennedy <toddke@google.com> | Wed Nov 18 15:38:28 2015 -0800 |
| tree | 41499d3e4ea08457ed2155814b459957e1966a98 | |
| parent | c38a5d7da10102b0664749f5720b6c50631e133d [diff] | |
| parent | 7d1428d7f3005abe23328c629ad33998f23cb575 [diff] |
resolve merge conflicts of 7d1428d7f3 to master. Change-Id: If6455063e7b47ad503d8ec15a8f1d2477065d6e8