tree a136269e69e75584c006e0b106b2f533343fdf08
parent 90bd55f179ce1c1e77775f69a03299f43699e7c1
parent e4db4e2b9dca065fbbf9f10dd5b9e961a9acef46
author Adam Powell <adamp@android.com> 1354563302 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354563302 -0800

am e4db4e2b: am 05c8f17f: Merge "resolver list is not cleared on rebuild"

* commit 'e4db4e2b9dca065fbbf9f10dd5b9e961a9acef46':
  resolver list is not cleared on rebuild