am f74cac46: am 9edc48e2: Merge "Updated assets." into jb-mr1-lockscreen-dev

* commit 'f74cac46991cb46dc6e80a02f0c3a83dc5ed12ed':
  Updated assets.