tree 7b3b342584fc99b147a8e38f0316f9411268ccb3
parent 980b2f053cac2deb7d85cff7465d1e02919f6a05
parent acbe9f6546455672b2edf51928d4fee4b6e246ba
author Robert Kozikowski <robertkoz@google.com> 1423075304 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423075304 +0000

am acbe9f65: Merge "Adding Launcher3 callbacks for trimming memory." into ub-launcher3-almonte

* commit 'acbe9f6546455672b2edf51928d4fee4b6e246ba':
  Adding Launcher3 callbacks for trimming memory.