tree 976915a3322f33de165757b491bd7d77acb46ef7
parent 3b035909ef03f993214c9ce9e93d0d35d1cc0b34
parent 6541898f6738794ff59a44b121e4a300d36ec393
author Igor Murashkin <iam@google.com> 1438801521 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438801521 +0000

am 6541898f: am 02f0771b: Merge "Revert "cleanup: Replace pointers with out-parameters and fix-up formatting""

* commit '6541898f6738794ff59a44b121e4a300d36ec393':
  Revert "cleanup: Replace pointers with out-parameters and fix-up formatting"