tree 279c047910e6a50ac9086184bdbda24e1e40067c
parent 156b11cfc763415581f5b45d6cb4936f892dba6d
parent 37d983d382ef40fa2ec62ebc3eace5d8838b6604
author Colin Cross <ccross@android.com> 1480739788 +0000
committer android-build-merger <android-build-merger@google.com> 1480739788 +0000

Merge "Remove references to non-existent directories" am: 6e11707f06  -s ours
am: 37d983d382  -s ours

Change-Id: I53c0c14f10803dc022391fa8059936fe6def2503