tree b41cf0d4f48baed24646946d411a2963d69497f2
parent e63d5b6897be97f972c62cbc0c3c0c8f2069617e
parent 55d22aeeb2dfdd66d5f274293a949627227af347
author Colin Cross <ccross@android.com> 1483572950 +0000
committer android-build-merger <android-build-merger@google.com> 1483572950 +0000

Merge "Remove references to non-existant directories" am: a3e78ca7d9
am: 55d22aeeb2

Change-Id: Ic1ea0ea151d5ea08f40554e828d33a1401ec4851