tree b8edd53e56d6d3f64d881fc9d124287270609002
parent ad3600bb6ebbd805fabddf4af2974939b985f883
parent 3fd0c48b8e0f1297dee8ffa6103fd19ebe03da82
author Robert Ly <robertly@google.com> 1335203082 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335203082 -0700

am 3fd0c48b: am 018c9eeb: Merge "adding media effects sample to sdk" into ics-mr1

* commit '3fd0c48b8e0f1297dee8ffa6103fd19ebe03da82':
  adding media effects sample to sdk