tree ff047088344473003b57037572041947db5a3310
parent 5d0c6d950027bfab31738db691e56dad96129cf9
parent f59e2624b33a428bbe484168ac4f96ca36a6c32e
author Ying Wang <wangying@google.com> 1365721428 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365721428 -0700

am f59e2624: am 14ae6e87: Merge "Get rid of the liblog hack." into jb-mr2-dev

* commit 'f59e2624b33a428bbe484168ac4f96ca36a6c32e':
  Get rid of the liblog hack.