tree d70676ba1dc8ab112102bb88b25e09e9e3d4c6ec
parent bd4172b085456b82efbdd623118576ded382255c
parent 73b3f5cde4bfdebbe4893f0234d1b0a9ddd09640
author Dan Albert <danalbert@google.com> 1426954437 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426954437 +0000

am 73b3f5cd: am 80dd2ac9: Merge "Fix SDK library paths for Windows and Darwin too."

* commit '73b3f5cde4bfdebbe4893f0234d1b0a9ddd09640':
  Fix SDK library paths for Windows and Darwin too.