tree b81de51f28130ec93909c23e0877872b1c9f3fd6
parent 9b74a78063707c45ffd1a173de51e215fd7e53b4
parent d18920f5c9c3f4662ceb8f729805ae06761cf108
author Aravind Akella <aakella@google.com> 1381458068 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381458068 -0700

am d18920f5: am d9b09fa9: Merge "Fix registerListener and flush bugs." into klp-dev

* commit 'd18920f5c9c3f4662ceb8f729805ae06761cf108':
  Fix registerListener and flush bugs.