tree 5584e01c7fb0cba7a87cef0ca39123c0d9e2c76c
parent 524809ba1d68b2a0164e399a490df8e63eda8258
parent 8165f0dd202a2c0fbf0816f7613d66938955dc76
author Ed Heyl <ed@google.com> 1343254066 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343254066 -0700

am 8165f0dd: resolve conflicts w/4f174f1d27adbde6f50e11ee3a8eaf162a030284

* commit '8165f0dd202a2c0fbf0816f7613d66938955dc76':
  Binding AllApps synchronously. (Bug 6855061)