tree bf6a40abb4695d60addf8fd1086d5e207c943b28
parent a9212864f38035e0b25f8b1df8d26eea5f5aae7c
parent db0944de128247e7e6016982a14513b04ac5e6f1
author Jean-Michel Trivi <jmtrivi@google.com> 1380694246 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380694246 -0700

am db0944de: am 60e7f819: Merge "Improve RemoteControlDisplay registration" into klp-dev

* commit 'db0944de128247e7e6016982a14513b04ac5e6f1':
  Improve RemoteControlDisplay registration