tree efd23f4ff496842aadcd4896459dddeabc07a7a0
parent ee7c1d8dc223381d4c3afce5fdbd8dc6f78091f3
parent b34811d8be33c9eb945cbe6745a6ad2b16fe7a31
author Martijn Coenen <maco@google.com> 1334858930 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1334858930 -0700

Merge "Prevent "Beaming" from home screen."