tree 70b5cf21c8f5cb0919a6e61840bdc349f3d72265
parent 7bdac71087a51be4655a0280a719a0b401614e47
parent b9d9efd39413248196161765811b84f6b90cf07d
author Conley Owens <cco3@android.com> 1422476944 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1422476945 +0000

Merge "Don't delete hooks in .git/hooks"