tree 363c810099db76bcc973ab07df80d8bd83db57d8
parent 69a6e50681344aca7c8471c554f3eee6c47ab898
parent 4324eec445c6882dce89a24765482293ed31914e
author Jean-Luc Brouillet <jeanluc@google.com> 1439503243 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1439503243 +0000

Merge changes from topic 'jeanluc-context'

* changes:
  Rename ctxt to context.
  Fix build break due to ctxt->context rename.