tree 8b12a3cad1eb9851177a1a312a24507408f92df3
parent e8966296b7bcf051872c48aa6220043d2709da87
parent 5070204e117d5a20f06fa337c652e36884f29d86
author Gilad Arnold <garnold@google.com> 1438899049 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438899049 +0000

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

* commit '5070204e117d5a20f06fa337c652e36884f29d86':
  Remove LOCAL_MODULE from generated DBus header path.