tree 77fb5b3aab716abe597041dc7ebbba68fc5c2778
parent 4c726b8f4ff5c36994aa396ab4256feb9a9f58cf
parent 807a3a35d6f22ababf10b6627c2e6338830e4c0c
author Colin Cross <ccross@android.com> 1480477069 +0000
committer android-build-merger <android-build-merger@google.com> 1480477069 +0000

Merge "Remove references to non-existant directories" am: 10ada2f2c2 am: b94019f32f
am: 807a3a35d6

Change-Id: I3bd412eecc570cee7977c6192227f3dd5bebe583