tree 398ec0fa4c4a7c2b3c1e39defc8be3c72a0f2a4e
parent e62267206a40b7a9f595e3148c664f058e6a8081
parent 0b2fab808754e36c89a40e4d5a646d6774dbfc08
author Gilad Arnold <garnold@google.com> 1438899458 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438899458 +0000

am 0b2fab80: am 5070204e: am 7b49da7e: Merge "Remove LOCAL_MODULE from generated DBus header path."

* commit '0b2fab808754e36c89a40e4d5a646d6774dbfc08':
  Remove LOCAL_MODULE from generated DBus header path.