tree b7345d00b026fc0c96a80f8f3c05cdc848f21746
parent 25da2d7ca2795156552ed96e1f3c3245330682b0
parent aff18fd60804e177c319d04dd4c12f3ee1c0cba8
author Dmitriy Ivanov <dimitry@google.com> 1435612128 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1435612129 +0000

Merge "Replace NULL with nullptr"