tree 30bf0cc961319af3a649599174894bf9f0439966
parent 217cc4437fba96753c4d68f09074d603c6e02d6a
parent 30e5b46ded6a73b8b8191f590417ab8d41190494
author Keun young Park <keunyoung@google.com> 1340654977 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340654977 -0700

am 30e5b46d: am fda4cc82: merge AOSP changes: media and graphics

* commit '30e5b46ded6a73b8b8191f590417ab8d41190494':
  merge AOSP changes: media and graphics