tree 572d82ed80a187549d2b20dc35885a327d7752f1
parent 6accdc62becf2ef0f5795fa1e9fc5dbb984e7376
parent 82aba97c37883f8a239ed1ef85e0a503c600883f
author Roland Levillain <rpl@google.com> 1439920436 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439920436 +0000

am 82aba97c: am fc5b096f: Merge "Fix codegen_test."

* commit '82aba97c37883f8a239ed1ef85e0a503c600883f':
  Fix codegen_test.