tree 2f1af2e2f4c30fb48950ea23156aa3903f6afaaa
parent 397301be5ea7f7cb7cf43bb10163a31618aa1829
parent 877b94867c7f420ab0d2f4e0ba7a3f6cc7c1f6e1
author Elliott Hughes <enh@google.com> 1402351201 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402351201 +0000

am 877b9486: am 815d7a7d: Merge "Fix build by removing libportable from the default build."

* commit '877b94867c7f420ab0d2f4e0ba7a3f6cc7c1f6e1':
  Fix build by removing libportable from the default build.