tree 10da860fcff71886af91d082e31f0e1917926848
parent b09ce569c4bc9269f8233c56beb0fb8d20b9a62e
parent 1122ebd51605ad21cda47b0478b64eca8866d036
author Adam Cohen <adamcohen@google.com> 1414566119 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566119 +0000

am 1122ebd5: am 46a26d8c: am c9bf387c: am bff51540: am 32655b2c: am 20df4f87: Merge "Ensuring launcher is always setting "interactionBegin/End" where appropriate (issue 11030735)" into jb-ub-now-indigo-rose

* commit '1122ebd51605ad21cda47b0478b64eca8866d036':