tree fa82b04ba312c5f8ccad38af5af4c112c6dde277
parent 2c0f8284cea239fc7cc1345b0d9f9a6b84c415ed
parent 314b8478252851337825d17ad789e11ad8f15345
author Colin Cross <ccross@android.com> 1484182033 +0000
committer android-build-merger <android-build-merger@google.com> 1484182033 +0000

Merge "Don't reference directory that doesn't exist" am: 949a78c265 am: 3c87d9716e
am: 314b847825

Change-Id: I11c23e91d8147108406b9bcfe188f309a644fcb2