tree c75669fd7602753774c8113a2fd5f3a6761e2f2a
parent 223a86e1a10b48c9676fb25364cdb3a164246f64
parent 054627c9ee92e6b0ef87e5ff3479b457d0c78bbe
author Dan Willemsen <dwillemsen@google.com> 1518037288 -0800
committer Dan Willemsen <dwillemsen@google.com> 1518037288 -0800

Merge remote-tracking branch 'aosp/upstream' into master

* aosp/upstream:
  Support the implicit "-a" in find

Test: OUT_DIR=out DIST_DIR=dist prebuilts/build-tools/build-prebuilts.sh
Change-Id: Ia1bf168a3ee4c7c01d66a810cacf648ab42e6edd