| commit | 9fb42f07784ac9e1ab29fa7d5bcda6c3081d238f | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Thu Dec 04 13:51:41 2014 -0800 |
| committer | John Reck <jreck@google.com> | Thu Dec 04 13:51:41 2014 -0800 |
| tree | 23fe00a35b718051d190f018ed8603d0c06acb14 | |
| parent | e1a96f7fe217ccc610bd3cfb4e9a66630c816571 [diff] | |
| parent | a75b0ad3842a5cfc406fbd9c7a36bf8a7bdcf069 [diff] |
resolved conflicts for merge of a75b0ad3 to master Change-Id: I32a2d129c556407727ada909daa6470309d42499