tree 1d08493577a7ea665e038ac652516b2bc16966c9
parent 75298e337a2c3655c6ff91572e56e575de766506
parent 71b7d891fc95d360df7a52c7008c92859b9dfdb8
author Daniel Sandler <dsandler@android.com> 1352408876 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352408876 -0800

am 71b7d891: Merge "New asset for assist affordance on lockscreen." into jb-mr1-lockscreen-dev

* commit '71b7d891fc95d360df7a52c7008c92859b9dfdb8':
  New asset for assist affordance on lockscreen.