tree 7010dc020d96fb43b70a927783cf00c06a29f07c
parent d0e7b198abf0b5d09944f25b8f4c38a86c2a1764
parent 17c051d9cd03dc22a83c6c74553e63109ba153c6
author Martin Fick <mfick@codeaurora.org> 1368537321 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1368537322 +0000

Merge "Improve explanation of path conflicts in project config doc" into stable-2.6