tree 60a9cc6d44ddf5c953b0abf57559521a50f53ada
parent e70a32afc5b27ddc9681efd867780a0c4c77edd3
parent 03d16e122aa01f9283836d1e5144428082b4c1cd
author Jean-Baptiste Queru <jbq@google.com> 1346092080 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346092080 -0700

am 03d16e12: Merge "Make setCaptureRate locale safe"

* commit '03d16e122aa01f9283836d1e5144428082b4c1cd':
  Make setCaptureRate locale safe