tree a46c2e960e771a2f5017c420addf1609997bc9e6
parent 002427719f642672a00d8c71cc1dec15450a0aaf
parent f807d1fa6f701558fe767fc85497bab8e5eb536a
author Dan Albert <danalbert@google.com> 1431473591 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431473591 +0000

am f807d1fa: Merge "Remove stlport from global package list." into mnc-dev

* commit 'f807d1fa6f701558fe767fc85497bab8e5eb536a':
  Remove stlport from global package list.