tree ee04e6c4f73bcd16cc6f4f789bbac24856b07bb7
parent 93f4441b9a71fcf4cbf850e3997f9cba8ff245fe
parent 8df212e770d0f0d4acc5bc5280dcbb15f6e67c76
author Hyundo Moon <hdmoon@google.com> 1499912115 +0000
committer android-build-merger <android-build-merger@google.com> 1499912115 +0000

Merge "MediaRouter: Suppress "Double tap to activate"" into oc-support-26.0-dev
am: 8df212e770

Change-Id: Ibe11a4802a18323d6933ce90a9c6d545fc28a7bb