tree cba62d0d64153aa2169651696bc238591341d679
parent ca53e5cb0eed31b1a5354108623111e01830c886
parent 46a26d8c518475b41c81a96eaee699dc8d72cd68
author Adam Cohen <adamcohen@google.com> 1414085232 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085232 +0000

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 '46a26d8c518475b41c81a96eaee699dc8d72cd68':