tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 20aba04b7bc54b60da4c378679e5407c57d2d289
parent c9bf387c1f5bf65d1d624451feea7c9889181487
author Adam Cohen <adamcohen@google.com> 1392411022 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411022 +0000

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