tree bd322dd09bc6187071a783436e37ebfd7b3187cb
parent 9a682002d0f0da0292af5b8e96aa51b7942acf81
parent 698d0464a52ee2610c4590ef313fe587deedb081
author Dan Albert <danalbert@google.com> 1431014309 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431014309 +0000

am 698d0464: Merge "Whitelist device for stlport."

* commit '698d0464a52ee2610c4590ef313fe587deedb081':
  Whitelist device for stlport.