tree 3f8895ee090a27509e21b667752a9da6a7445367
parent ed531d70169dd43724a948727151e38640b4bddb
parent 0baccce0e7ce6e88c577fe1150afe2df5e5a4e80
author Colin Cross <ccross@android.com> 1480540506 +0000
committer android-build-merger <android-build-merger@google.com> 1480540506 +0000

Merge "Remove references to non-existant directories" am: 977698ff45
am: 0baccce0e7

Change-Id: Ib70e3546119862b74ac5faee71ca3d37f8813a56