tree 8db7ed081da7f64d97d1c85ab030713ea0d17d25
parent 6e96068a334053e641db6d20fff263c5cb7647d6
parent 34899b9c1a65827ab510d6c6c2e3dd84a824b472
author Adam Cohen <adamcohen@google.com> 1413799376 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413799376 +0000

am 34899b9c: Merge "Use LauncherCallbacks model instead of method overrides" into ub-now-queens

* commit '34899b9c1a65827ab510d6c6c2e3dd84a824b472':
  Use LauncherCallbacks model instead of method overrides