tree bacd9e3a450a128cc465c4a9ffac09a5178649ce
parent ed10c013bd6f6775cd6bb834283303deed55daa7
parent b3fff9d98a3e3c886d4efa912d7ad6753dd7ec9c
author Adam Cohen <adamcohen@google.com> 1442857250 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442857250 +0000

am b3fff9d9: Merge "Cleanup some incorrect / noisey calls to CustomContentCallbacks#onShow / onHide" into ub-launcher3-burnaby

* commit 'b3fff9d98a3e3c886d4efa912d7ad6753dd7ec9c':
  Cleanup some incorrect / noisey calls to CustomContentCallbacks#onShow / onHide