tree 2251ae6180bc6f29063fadd00250c7bdf9f4b094
parent a164c2d18f1b8273a876338dbc34cd7c5d0723d8
parent c4a1e135ce32ee2d29dd756873ab23b64722271d
author Martin Fick <mfick@codeaurora.org> 1326322087 -0800
committer gerrit code review <noreply-gerritcodereview@google.com> 1326322087 -0800

Merge "prolog: Fix NoBlock and NoOp functions." into stable