tree c02deed6a8babddad5a4a8b8c34d40840f516adf
parent 1497e7e76784c01043cf328177de076c70db6e86
parent 40d48e177f243c6093a45301db122a0475cc1124
author Dan Albert <danalbert@google.com> 1416265138 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416265138 +0000

am 40d48e17: Merge "Stop using stlport."

* commit '40d48e177f243c6093a45301db122a0475cc1124':
  Stop using stlport.