| commit | e5530ec0b4204f4f3b4f92a87056ce18a8d76793 | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Thu Jan 21 16:45:31 2016 -0800 |
| committer | John Reck <jreck@google.com> | Thu Jan 21 16:45:31 2016 -0800 |
| tree | 7c4533107d2a6b5d6d9ef5274a7547b97703c525 | |
| parent | 17b179d5e542e75954737103d6d1cf8bfa942d57 [diff] | |
| parent | 32a95af029636e4d067c818d3ff1262574d88bbf [diff] |
resolve merge conflicts of 32a95af029 to master. Change-Id: I35b7cea1d34cb24f431ba2b76433a5b0ef1cb602