tree 1a11f118a37f8ba87b5a5dd3b2102dcc11452253
parent 9823723d0f0bb47dfd3a6b251d7155dc1eb0918b
parent f526e1e0484f29291218c0589d87586cf6660b81
author Eric Laurent <elaurent@google.com> 1350688387 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1350688388 -0700

Merge "New camera sounds" into jb-mr1-dev