tree de9d7544787a92493a6834fe19855a11969fc734
parent 1b60da7d534e1f004b19ebeddc066f4ce1c1c750
parent 169d029c763a7e652e6d22ae42bb23707675541b
author Elliott Hughes <enh@google.com> 1426698906 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426698906 +0000

am 169d029c: am 789c99a4: Merge "Switch init over to _PATH_DEFPATH."

* commit '169d029c763a7e652e6d22ae42bb23707675541b':
  Switch init over to _PATH_DEFPATH.