tree 3d99ff97408a6e1b5fe8bf055b2afea4559e9552
parent 9bc44c3c814048a7389153fc844326592a004866
parent d47d90224a6f723ea7b30a5767c9faccc02e63bd
author Adam Cohen <adamcohen@google.com> 1429911387 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429911387 +0000

am d47d9022: Merge "Add override method to fix building against master support lib." into ub-launcher3-burnaby

* commit 'd47d90224a6f723ea7b30a5767c9faccc02e63bd':
  Add override method to fix building against master support lib.