tree c5e9cfe927b2ace9e27923058dda8fce2f15f8ee
parent b11ab0f497121c4f4ce9ea8648fe4f8e22faa124
parent 0e292002c2da581bc0ff2bbc3d057bfe2f573d44
author Greg Hackmann <ghackmann@google.com> 1386095729 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386095729 -0800

am 0e292002: Merge "libadf: filter overlay engines by a list of acceptable formats"

* commit '0e292002c2da581bc0ff2bbc3d057bfe2f573d44':
  libadf: filter overlay engines by a list of acceptable formats