tree 66acf2b8357c9fabe8afb21ed5eb6c8d94cf8a86
parent 9d083a1c2a3d82c631e00e275be99e18ff0209c3
parent bd4a78937ffe2f37386dae4ae8817e33422c1267
author Adam Cohen <adamcohen@google.com> 1423265666 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423265666 +0000

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

* commit 'bd4a78937ffe2f37386dae4ae8817e33422c1267':
  Revert "Adding Launcher3 callbacks for trimming memory."