tree a6c782c31a6e8909112228aa0ef6d4cc2b9d4324
parent 4417dad18b7927fd42f88d144f39bbe244a76bb9
parent ec51d818c5ce8fa6985ed9779a44647cfb040f8a
author JP Abgrall <jpa@google.com> 1385413477 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385413477 -0800

am ec51d818: am 71f2f251: Merge "logwrapper: fix missing include"

* commit 'ec51d818c5ce8fa6985ed9779a44647cfb040f8a':
  logwrapper: fix missing include