tree e2036b76b27a3bc52d8f381b54a2ed6eb3ca5232
parent 4a89348ee1c5e7c9fcf52709b8ef153b6dbc17e2
parent 52f52702dac55c0fde27d907ac9ebb21fc707c68
author Hongwei Wang <hwwang@google.com> 1379120350 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379120350 -0700

am 52f52702: Merge "Realtime drop area" into klp-dev

* commit '52f52702dac55c0fde27d907ac9ebb21fc707c68':
  Realtime drop area