tree c855f83d8f5325ff7a7ccded6d4e562c6b8341a1
parent 4b89f77a3cd53a7b55321f0960c7e5b23db9f63a
parent 10d158c2bada25c85a1797b83af67ada7b1c0452
author Elliott Hughes <enh@google.com> 1436371057 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436371057 +0000

am 10d158c2: am 931c12b8: Merge "Fix dbus build."

* commit '10d158c2bada25c85a1797b83af67ada7b1c0452':
  Fix dbus build.