tree 63ffd97da6e132614d9789075a4956ec107ca53f
parent 8ef91cdcbe5cecc5d34adb89bd7ef98320ebcf8d
parent 7c9adaf6b90164f17164852276734f95c6d2c46f
author Jean-Michel Trivi <jmtrivi@google.com> 1384472943 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384472943 -0800

am 7c9adaf6: am dc6da58a: am 2a96fc1f: Merge "Fix RemoteController update in RemoteControlClient registration" into klp-dev

* commit '7c9adaf6b90164f17164852276734f95c6d2c46f':
  Fix RemoteController update in RemoteControlClient registration