tree ebd4d739215332e242fa5cba88f95c0791873d42
parent d9e8e5d922f2a76780764403ddb8756f82284c2a
parent 9741cd951d05b468bb15e7b1554f939393ddf582
author Jean-Luc Brouillet <jeanluc@google.com> 1440672623 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440672623 +0000

am 9741cd95: (-s ours) am 9764eb3b: Change the name for the new rs_context parameter.

* commit '9741cd951d05b468bb15e7b1554f939393ddf582':