tree c303576936ee70a09246f3eec41e25de348f7802
parent 36cb84fcae92e583e08954bfc6fe16b94db23212
parent 6ef19dadbf1f2e35551d2bf559b0d533f77b366d
author Android (Google) Code Review <android-gerrit@google.com> 1248060012 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1248060012 -0700

am 6ef19dad: Merge change 7040 into donut

Merge commit '6ef19dadbf1f2e35551d2bf559b0d533f77b366d'

* commit '6ef19dadbf1f2e35551d2bf559b0d533f77b366d':
  CTS: Add media test cases to CTS makefile