tree 580f7f83c9a3bf09b64ee5e32fa569e395462d94
parent 09a7e88621e563f798cf4752c533f7ce86a6deb1
parent bbb7b1b62075f1ac34e94a357747ed4692229c14
author Dan Willemsen <dwillemsen@google.com> 1459376769 +0000
committer android-build-merger <android-build-merger@google.com> 1459376769 +0000

Merge changes Ib0fdae2e,Ib8b9e0f8 into nyc-dev
am: bbb7b1b  -s ours

* commit 'bbb7b1b62075f1ac34e94a357747ed4692229c14':
  Handle symlinked OUT_DIRs (again)
  Handle out being a symlink

Change-Id: I7aaacf47572773503ec1934cfb06c98757e23dc4