tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 36f7ad9314bf630ea1977424c34a6c2b5ca4035c
parent bff515401d3542abdaf50983ca00e0baefe4db12
author Adam Cohen <adamcohen@google.com> 1392410140 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410140 +0000

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 'bff515401d3542abdaf50983ca00e0baefe4db12':