| commit | 1ec5d69b34224d6ef5660c8e11062383ad423714 | [log] [tgz] |
|---|---|---|
| author | Clay Murphy <claym@google.com> | Fri Feb 20 20:45:36 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Feb 20 20:45:36 2015 +0000 |
| tree | 2fbc8dc33eee140b848e73e00b91f2164a6bda86 | |
| parent | eae957b2623ee069e76153b7293aa2387bdcd254 [diff] | |
| parent | 3da74fef1331ccae9988b455b993f3ba4f8079c0 [diff] |
Merge "Docs: Removing extra lossless entry and fixing conflict"