tree bd322dd09bc6187071a783436e37ebfd7b3187cb
parent 9deea37a07db65be14437f8ed458a792dce11955
parent 9d224b258c58157ee63d3f0bd32ae9b3b06b2c7d
author Dan Albert <danalbert@google.com> 1431473866 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431473866 +0000

am 9d224b25: Whitelist device for stlport.

* commit '9d224b258c58157ee63d3f0bd32ae9b3b06b2c7d':
  Whitelist device for stlport.