tree f2ff0137c9d518340b018d5773c43d9cd314a593
parent 17b8bd12f423ef7eec67c70c926175157bd8e7f3
parent 832c54857519c405d7aa0d3bccfe74078f1a1abf
author Justin Ho <justinho@google.com> 1318283015 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318283015 -0700

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

* commit '832c54857519c405d7aa0d3bccfe74078f1a1abf':
  Update screen lock/unlock sound Bug: 5416299