tree a630d417a33a151b3c75fa873e1981c136d1a479
parent 92cabadf900e5489c33599becebc8265569d57ff
parent c7dd6640246841672a60e0c0ec4d9544372e1f84
author Jean-Michel Trivi <jmtrivi@google.com> 1353463410 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1353463410 -0800

am c7dd6640: Merge "Fix audio focus evaluation order for display update" into jb-mr1.1-dev

* commit 'c7dd6640246841672a60e0c0ec4d9544372e1f84':
  Fix audio focus evaluation order for display update