tree 082983a200943c3a8eb35efba934e3bb6201bf0f
parent 485db9d64fef81b4c9fc8dad529bb6b8ab741c6c
parent 85fe015506876941051e9f628ff6273b8558071a
author Mark Salyzyn <salyzyn@google.com> 1428539924 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428539924 +0000

am 463913e6: am e74baca6: Merge "logd: Build Breakage"

* commit '463913e682aff2a427ecb29ad6ac71c6391848ae':
  logd: Build Breakage