am d1a3fc38: am 609bbf18: Merge change I54089080 into eclair

Merge commit 'd1a3fc38e99e0483402168529020e758ecd777ce' into eclair-mr2-plus-aosp

* commit 'd1a3fc38e99e0483402168529020e758ecd777ce':
  Update keyguard and pattern-lock layouts for new UX designs.
tree: a25c183b9ae2c75fb2c0c3dc5002a65928e1bd17
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE