am 832c5485: Merge "Update screen lock/unlock sound Bug: 5416299" into ics-factoryrom

* commit '832c54857519c405d7aa0d3bccfe74078f1a1abf':
  Update screen lock/unlock sound Bug: 5416299
tree: 466b5295a393699f12523b6cd4fb41ee7b8a7149
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE