tree ecf3a9e717071d723e37f00b852190834a43c325
parent b8430eabc4f803b443f175cb1f4aff1942e8cd6f
parent 9e39ebf249018f04ea1ef6c9c87742880285b827
author Jean-Michel Trivi <jmtrivi@google.com> 1314407860 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1314407860 -0700

Merge "Address multiple RemoteControlDisplay competing for registration"