tree 9a73dc91d7f2b4682d622540d84c9829f45f5558
parent 528c95be3a8d2770f9bc27e1245f930cd74ca9f2
parent 24e18aea81ad0c411ce5adb13773595005f8565f
author Adam Cohen <adamcohen@google.com> 1414068388 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414068388 +0000

am 24e18aea: Merge "First pass of the Launcher Overlay interface / impl" into ub-now-queens

* commit '24e18aea81ad0c411ce5adb13773595005f8565f':
  First pass of the Launcher Overlay interface / impl