tree b07754cf7f01766b91ecd4664112703d4528cc00
parent 88aad1af7f6f3f775d10b8ea5e61225c0c89d3d1
parent 975590f22916e184204678758bb339c1d2b6b57f
author Jason Monk <jmonk@google.com> 1415387150 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415387150 +0000

am 975590f2: Merge "Material design for screen pinning cling" into lmp-mr1-dev

* commit '975590f22916e184204678758bb339c1d2b6b57f':
  Material design for screen pinning cling