tree 7c99fc0b23cf23aa826f5e19d60cd3b883410eec
parent 6d90e89afa47293cf5fe18f512cce43d2fa6df82
parent 583fefc8dcadecc7fc933513d3569dd9c16c100c
author Mathias Agopian <mathias@google.com> 1287635305 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287635305 -0700

am 583fefc8: Merge "Use the context_priority extension when present." into gingerbread

Merge commit '583fefc8dcadecc7fc933513d3569dd9c16c100c' into gingerbread-plus-aosp

* commit '583fefc8dcadecc7fc933513d3569dd9c16c100c':
  Use the context_priority extension when present.