tree 31930a291c99fe616059e735ef57023eff11a9c7
parent b7669c7998301d7961d5111238cfc019535b3fc9
parent 401142b32a3d137d20b61b0146301ebd270b7dfe
author Dan Willemsen <dwillemsen@google.com> 1440672584 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440672584 +0000

am 401142b3: (-s ours) am 6e28f1c4: am e56ba8b6: Merge "build: All paths are TOP-relative"

* commit '401142b32a3d137d20b61b0146301ebd270b7dfe':